http: drop http_error function

peff · gitster · commit 4df13f69e9fa · 2013-04-06T18:56:46.000-07:00
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 &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -941,11 +941,6 @@ static int http_get_file(const char *url, const char *filename, int options)
 	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
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -1551,7 +1551,7 @@ static int remote_exists(const char *path)`
`1551`	`1551`	`ret = 0;`
`1552`	`1552`	`break;`
`1553`	`1553`	`case HTTP_ERROR:`
`1554`		`- http_error(url);`
	`1554`	`+ error("unable to access '%s': %s", url, curl_errorstr);`
`1555`	`1555`	`default:`
`1556`	`1556`	`ret = -1;`
`1557`	`1557`	`}`
Original file line number	Diff line number	Diff line change
`@@ -941,11 +941,6 @@ static int http_get_file(const char url, const char filename, int options)`
`941`	`941`	`return ret;`
`942`	`942`	`}`
`943`	`943`
`944`		`-void http_error(const char *url)`
`945`		`-{`
`946`		`- error("unable to access '%s': %s", url, curl_errorstr);`
`947`		`-}`
`948`		`-`
`949`	`944`	`int http_fetch_ref(const char base, struct ref ref)`
`950`	`945`	`{`
`951`	`946`	`char *url;`