mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-curl: pass curl slot_results back through run_slot

Browse Source 
Some callers may want to know more than just the integer
error code we return. Let them optionally pass a
slot_results struct to fill in (or NULL if they do not
care). In either case we continue to return the integer
code.

We can also give probe_rpc the same treatment (since it
builds directly on run_slot).

Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
Jeff King
2013-10-31 02:36:26 -04:00
committed by Junio C Hamano
parent 0972ccd97c
commit 3a347ed707
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
remote-curl.c
View File

@ -364,25 +364,29 @@ static size_t rpc_in(char *ptr, size_t eltsize,
return size; return size;
} }
static int run_slot(struct active_request_slot *slot) static int run_slot(struct active_request_slot *slot,
struct slot_results *results)
{ {
int err; int err;
struct slot_results results; struct slot_results results_buf;
slot->results = &results; if (!results)
results = &results_buf;
slot->results = results;
slot->curl_result = curl_easy_perform(slot->curl); slot->curl_result = curl_easy_perform(slot->curl);
finish_active_slot(slot); finish_active_slot(slot);
err = handle_curl_result(&results); err = handle_curl_result(results);
if (err != HTTP_OK && err != HTTP_REAUTH) { if (err != HTTP_OK && err != HTTP_REAUTH) {
error("RPC failed; result=%d, HTTP code = %ld", error("RPC failed; result=%d, HTTP code = %ld",
results.curl_result, results.http_code); results->curl_result, results->http_code);
} }
return err; return err;
} }
static int probe_rpc(struct rpc_state *rpc) static int probe_rpc(struct rpc_state *rpc, struct slot_results *results)
{ {
struct active_request_slot *slot; struct active_request_slot *slot;
struct curl_slist *headers = NULL; struct curl_slist *headers = NULL;
@ -404,7 +408,7 @@ static int probe_rpc(struct rpc_state *rpc)
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
curl_easy_setopt(slot->curl, CURLOPT_FILE, &buf); curl_easy_setopt(slot->curl, CURLOPT_FILE, &buf);
err = run_slot(slot); err = run_slot(slot, results);
curl_slist_free_all(headers); curl_slist_free_all(headers);
strbuf_release(&buf); strbuf_release(&buf);
@ -443,7 +447,7 @@ static int post_rpc(struct rpc_state *rpc)
if (large_request) { if (large_request) {
do { do {
err = probe_rpc(rpc); err = probe_rpc(rpc, NULL);
} while (err == HTTP_REAUTH); } while (err == HTTP_REAUTH);
if (err != HTTP_OK) if (err != HTTP_OK)
return -1; return -1;
@ -542,7 +546,7 @@ retry:
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, rpc_in); curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, rpc_in);
curl_easy_setopt(slot->curl, CURLOPT_FILE, rpc); curl_easy_setopt(slot->curl, CURLOPT_FILE, rpc);
err = run_slot(slot); err = run_slot(slot, NULL);
if (err == HTTP_REAUTH && !large_request) if (err == HTTP_REAUTH && !large_request)
goto retry; goto retry;
if (err != HTTP_OK) if (err != HTTP_OK)