From: Tay Ray Chuan Date: Sat, 06 Jun 2009 08:43:54 GMT Subject: [PATCH 16/23] transport.c::get_refs_via_curl(): use the new http API Message-ID: <20090606164354.82d6073b.rctay89@gmail.com> In-Reply-To: From: Mike Hommey Signed-off-by: Mike Hommey Signed-off-by: Tay Ray Chuan --- This is based on Mike's earlier patch: Subject: [WIP Patch 05/12] Use the new http API in get_refs_via_curl() Date: Sun, 18 Jan 2009 09:04:30 +0100 I added back the die()'s like in the original, which Mike had removed. transport.c | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/transport.c b/transport.c index 9edd5aa..af75f7b 100644 --- a/transport.c +++ b/transport.c @@ -439,9 +439,7 @@ static struct ref *get_refs_via_curl(struct transport *transport, int for_push) char *ref_name; char *refs_url; int i = 0; - - struct active_request_slot *slot; - struct slot_results results; + int http_ret; struct ref *refs = NULL; struct ref *ref = NULL; @@ -461,25 +459,16 @@ static struct ref *get_refs_via_curl(struct transport *transport, int for_push) refs_url = xmalloc(strlen(transport->url) + 11); sprintf(refs_url, "%s/info/refs", transport->url); - 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_URL, refs_url); - curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL); - - if (start_active_slot(slot)) { - run_active_slot(slot); - if (results.curl_result != CURLE_OK) { - strbuf_release(&buffer); - if (missing_target(&results)) - die("%s not found: did you run git update-server-info on the server?", refs_url); - else - die("%s download error - %s", refs_url, curl_errorstr); - } - } else { - strbuf_release(&buffer); - die("Unable to start HTTP request"); + http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE); + switch (http_ret) { + case HTTP_OK: + break; + case HTTP_MISSING_TARGET: + die("%s not found: did you run git update-server-info on the" + " server?", refs_url); + default: + http_error(refs_url, http_ret); + die("HTTP request failed"); } data = buffer.buf; @@ -519,6 +508,8 @@ static struct ref *get_refs_via_curl(struct transport *transport, int for_push) free(ref); } +cleanup: + strbuf_release(&buffer); free(refs_url); return refs; } -- 1.6.3.1