http: drop http_error function

This function is a single-liner and is only called from one
place. Just inline it, which makes the code more obvious.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/http-push.c b/http-push.c
index 439a555a72e81d54e2cd453eae07e24e5ab61e66..395a8cfc1055fb6febc9cee559d8943bb4d9e829 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -1551,7 +1551,7 @@ static int remote_exists(const char *path)
                ret = 0;
                break;
        case HTTP_ERROR:
                ret = 0;
                break;
        case HTTP_ERROR:

-               http_error(url);
+               error("unable to access '%s': %s", url, curl_errorstr);

        default:
                ret = -1;
        }
        default:
                ret = -1;
        }

diff --git a/http.c b/http.c
index 64068a2fc7248d377401d31e5d8aa1ecd82fcbd9..58c063c91b15d5c20e0233c57fb2fa7377163379 100644 (file)
--- a/http.c
+++ b/http.c
@@ -941,11 +941,6 @@ static int http_get_file(const char *url, const char *filename, int options)
        return ret;
 }
 
        return ret;
 }
 

-void http_error(const char *url)
-{
-       error("unable to access '%s': %s", url, curl_errorstr);
-}
-

 int http_fetch_ref(const char *base, struct ref *ref)
 {
        char *url;
 int http_fetch_ref(const char *base, struct ref *ref)
 {
        char *url;

diff --git a/http.h b/http.h
index fa65128f9e0e2712bc7f4e58bec4eeb2c2e9ce35..4dc53531ae07cb1fc223afad22255311bd3b9523 100644 (file)
--- a/http.h
+++ b/http.h
@@ -135,11 +135,6 @@ extern char *get_remote_object_url(const char *url, const char *hex,
  */
 int http_get_strbuf(const char *url, struct strbuf *content_type, struct strbuf *result, int options);
 
  */
 int http_get_strbuf(const char *url, struct strbuf *content_type, struct strbuf *result, int options);
 

-/*
- * Prints an error message using error() containing url and curl_errorstr.
- */
-void http_error(const char *url);
-

 extern int http_fetch_ref(const char *base, struct ref *ref);
 
 /* Helpers for fetching packs */
 extern int http_fetch_ref(const char *base, struct ref *ref);
 
 /* Helpers for fetching packs */