[PATCH 14/18] http-push: use the new http API in fetch_symref()
From: Tay Ray Chuan <hidden>
Date: 2016-06-15 22:46:49
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Mike Hommey <redacted> Signed-off-by: Tay Ray Chuan <redacted> --- http-push.c | 20 +++----------------- 1 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/http-push.c b/http-push.c
index 5b20cec..7aa4fc4 100644
--- a/http-push.c
+++ b/http-push.c@@ -2024,27 +2024,13 @@ static void fetch_symref(const char *path, char **symref, unsigned char *sha1) { char *url; struct strbuf buffer = STRBUF_INIT; - struct active_request_slot *slot; - struct slot_results results; url = xmalloc(strlen(repo->url) + strlen(path) + 1); sprintf(url, "%s%s", repo->url, path); - slot = get_active_slot(); - slot->results = &results; - curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer); - curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); - curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL); - curl_easy_setopt(slot->curl, CURLOPT_URL, url); - if (start_active_slot(slot)) { - run_active_slot(slot); - if (results.curl_result != CURLE_OK) { - die("Couldn't get %s for remote symref\n%s", - url, curl_errorstr); - } - } else { - die("Unable to start remote symref request"); - } + if (http_get_strbuf(url, &buffer, 0) != HTTP_OK) + die("Couldn't get %s for remote symref\n%s", url, + curl_errorstr); free(url); free(*symref); --
1.6.3.1