summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-04-05 22:22:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-04-07 01:56:46 (GMT)
commit4df13f69e9facbd09a2b06478e8c40082cda7ce6 (patch)
tree460c2810930438b8b7516c468a2df563373f1c7a
parentde89f0b25a42238948787421c0253228c006f7fa (diff)
downloadgit-4df13f69e9facbd09a2b06478e8c40082cda7ce6.zip
git-4df13f69e9facbd09a2b06478e8c40082cda7ce6.tar.gz
git-4df13f69e9facbd09a2b06478e8c40082cda7ce6.tar.bz2
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>
-rw-r--r--http-push.c2
-rw-r--r--http.c5
-rw-r--r--http.h5
3 files changed, 1 insertions, 11 deletions
diff --git a/http-push.c b/http-push.c
index 439a555..395a8cf 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 64068a2..58c063c 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 fa65128..4dc5353 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 */