diff options
| author | Jeff King <peff@peff.net> | 2016-12-06 18:24:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-06 20:32:48 (GMT) |
| commit | fcaa6e64b3f5eecde2b818385ec6f374f61ee7b2 (patch) | |
| tree | f4eb6585d94582107c94893e9c2566647c409069 /remote-curl.c | |
| parent | 6628eb41db5189c0cdfdced6d8697e7c813c5f0f (diff) | |
| download | git-fcaa6e64b3f5eecde2b818385ec6f374f61ee7b2.zip git-fcaa6e64b3f5eecde2b818385ec6f374f61ee7b2.tar.gz git-fcaa6e64b3f5eecde2b818385ec6f374f61ee7b2.tar.bz2 | |
remote-curl: rename shadowed options variable
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>
Diffstat (limited to 'remote-curl.c')
| -rw-r--r-- | remote-curl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/remote-curl.c b/remote-curl.c index 6b83b77..e3803da 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -254,7 +254,7 @@ static struct discovery *discover_refs(const char *service, int for_push) struct strbuf effective_url = STRBUF_INIT; struct discovery *last = last_discovery; int http_ret, maybe_smart = 0; - struct http_get_options options; + struct http_get_options http_options; if (last && !strcmp(service, last->service)) return last; @@ -271,15 +271,15 @@ static struct discovery *discover_refs(const char *service, int for_push) strbuf_addf(&refs_url, "service=%s", service); } - memset(&options, 0, sizeof(options)); - options.content_type = &type; - options.charset = &charset; - options.effective_url = &effective_url; - options.base_url = &url; - options.no_cache = 1; - options.keep_error = 1; + memset(&http_options, 0, sizeof(http_options)); + http_options.content_type = &type; + http_options.charset = &charset; + http_options.effective_url = &effective_url; + http_options.base_url = &url; + http_options.no_cache = 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) { case HTTP_OK: break; |