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

remote-curl: rename shadowed options variable

Browse Source 
The discover_refs() function has a local "options" variable
to hold the http_get_options we pass to http_get_strbuf().
But this shadows the global "struct options" that holds our
program-level options, which cannot be accessed from this
function.

Let's give the local one a more descriptive name so we can
tell the two apart.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2016-12-06 13:24:38 -05:00
committed by Junio C Hamano
parent 6628eb41db
commit fcaa6e64b3
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
remote-curl.c
View File

@ -254,7 +254,7 @@ static struct discovery *discover_refs(const char *service, int for_push)
struct strbuf effective_url = STRBUF_INIT; struct strbuf effective_url = STRBUF_INIT;
struct discovery *last = last_discovery; struct discovery *last = last_discovery;
int http_ret, maybe_smart = 0; int http_ret, maybe_smart = 0;
struct http_get_options options; struct http_get_options http_options;
if (last && !strcmp(service, last->service)) if (last && !strcmp(service, last->service))
return last; return last;
@ -271,15 +271,15 @@ static struct discovery *discover_refs(const char *service, int for_push)
strbuf_addf(&refs_url, "service=%s", service); strbuf_addf(&refs_url, "service=%s", service);
} }
memset(&options, 0, sizeof(options)); memset(&http_options, 0, sizeof(http_options));
options.content_type = &type; http_options.content_type = &type;
options.charset = &charset; http_options.charset = &charset;
options.effective_url = &effective_url; http_options.effective_url = &effective_url;
options.base_url = &url; http_options.base_url = &url;
options.no_cache = 1; http_options.no_cache = 1;
options.keep_error = 1; http_options.keep_error = 1;
http_ret = http_get_strbuf(refs_url.buf, &buffer, &options); http_ret = http_get_strbuf(refs_url.buf, &buffer, &http_options);
switch (http_ret) { switch (http_ret) {
case HTTP_OK: case HTTP_OK:
break; break;