From: Jeff King <peff@peff.net>
Date: Fri, 5 Apr 2013 22:22:31 +0000 (-0400)
Subject: http: drop http_error function
X-Git-Tag: v1.8.3-rc0~73^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4df13f69e9facbd09a2b06478e8c40082cda7ce6;p=thirdparty%2Fgit.git

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 439a555a72..395a8cfc10 100644
--- 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:
-		http_error(url);
+		error("unable to access '%s': %s", url, curl_errorstr);
 	default:
 		ret = -1;
 	}
diff --git a/http.c b/http.c
index 64068a2fc7..58c063c91b 100644
--- a/http.c
+++ b/http.c
@@ -941,11 +941,6 @@ cleanup:
 	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;
diff --git a/http.h b/http.h
index fa65128f9e..4dc53531ae 100644
--- 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);
 
-/*
- * 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 */