From 67d2a7b5c502496b0c5acd25a5e0ffa766b61745 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 5 Apr 2013 18:21:34 -0400 Subject: http: simplify http_error helper function This helper function should really be a one-liner that prints an error message, but it has ended up unnecessarily complicated: 1. We call error() directly when we fail to start the curl request, so we must later avoid printing a duplicate error in http_error(). It would be much simpler in this case to just stuff the error message into our usual curl_errorstr buffer rather than printing it ourselves. This means that http_error does not even have to care about curl's exit value (the interesting part is in the errorstr buffer already). 2. We return the "ret" value passed in to us, but none of the callers actually cares about our return value. We can just drop this entirely. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- http.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'http.c') diff --git a/http.c b/http.c index 45cc7c7010..5e6f67d004 100644 --- a/http.c +++ b/http.c @@ -857,7 +857,8 @@ static int http_request(const char *url, struct strbuf *type, run_active_slot(slot); ret = handle_curl_result(&results); } else { - error("Unable to start HTTP request for %s", url); + snprintf(curl_errorstr, sizeof(curl_errorstr), + "failed to start HTTP request"); ret = HTTP_START_FAILED; } @@ -940,13 +941,9 @@ cleanup: return ret; } -int http_error(const char *url, int ret) +void http_error(const char *url) { - /* http_request has already handled HTTP_START_FAILED. */ - if (ret != HTTP_START_FAILED) - error("%s while accessing %s", curl_errorstr, url); - - return ret; + error("%s while accessing %s", curl_errorstr, url); } int http_fetch_ref(const char *base, struct ref *ref) -- cgit v1.2.1