projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use __VA_ARGS__ for all of error's arguments
[git.git]
/
http.c
diff --git
a/http.c
b/http.c
index f9a9de141622549ec4338cbbfc2f430029696ebe..0a8abf3be369a18fae8e743d4cc9b5f2c2f63f03 100644
(file)
--- a/
http.c
+++ b/
http.c
@@
-757,8
+757,7
@@
char *get_remote_object_url(const char *url, const char *hex,
return strbuf_detach(&buf, NULL);
}
return strbuf_detach(&buf, NULL);
}
-int handle_curl_result(struct active_request_slot *slot,
- struct slot_results *results)
+int handle_curl_result(struct slot_results *results)
{
if (results->curl_result == CURLE_OK) {
credential_approve(&http_auth);
{
if (results->curl_result == CURLE_OK) {
credential_approve(&http_auth);
@@
-771,7
+770,6
@@
int handle_curl_result(struct active_request_slot *slot,
return HTTP_NOAUTH;
} else {
credential_fill(&http_auth);
return HTTP_NOAUTH;
} else {
credential_fill(&http_auth);
- init_curl_http_auth(slot->curl);
return HTTP_REAUTH;
}
} else {
return HTTP_REAUTH;
}
} else {
@@
-833,7
+831,7
@@
static int http_request(const char *url, void *result, int target, int options)
if (start_active_slot(slot)) {
run_active_slot(slot);
if (start_active_slot(slot)) {
run_active_slot(slot);
- ret = handle_curl_result(
slot,
&results);
+ ret = handle_curl_result(&results);
} else {
error("Unable to start HTTP request for %s", url);
ret = HTTP_START_FAILED;
} else {
error("Unable to start HTTP request for %s", url);
ret = HTTP_START_FAILED;