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

http: refactor options to http_get_*

Browse Source 
Over time, the http_get_strbuf function has grown several
optional parameters. We now have a bitfield with multiple
boolean options, as well as an optional strbuf for returning
the content-type of the response. And a future patch in this
series is going to add another strbuf option.

Treating these as separate arguments has a few downsides:

  1. Most call sites need to add extra NULLs and 0s for the
     options they aren't interested in.

  2. The http_get_* functions are actually wrappers around
     2 layers of low-level implementation functions. We have
     to pass these options through individually.

  3. The http_get_strbuf wrapper learned these options, but
     nobody bothered to do so for http_get_file, even though
     it is backed by the same function that does understand
     the options.

Let's consolidate the options into a single struct. For the
common case of the default options, we'll allow callers to
simply pass a NULL for the options struct.

The resulting code is often a few lines longer, but it ends
up being easier to read (and to change as we add new
options, since we do not need to update each call site).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
This commit is contained in:
Jeff King
2013-09-28 04:31:23 -04:00
committed by Jonathan Nieder
parent 132b70a2ed
commit 1bbcc224cc
4 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
remote-curl.c
View File

@ -187,6 +187,7 @@ static struct discovery* discover_refs(const char *service, int for_push)
struct discovery *last = last_discovery;
char *refs_url;
int http_ret, maybe_smart = 0;
struct http_get_options options;
if (last && !strcmp(service, last->service))
return last;
@ -204,8 +205,12 @@ static struct discovery* discover_refs(const char *service, int for_push)
}
refs_url = strbuf_detach(&buffer, NULL);
http_ret = http_get_strbuf(refs_url, &type, &buffer,
HTTP_NO_CACHE | HTTP_KEEP_ERROR);
memset(&options, 0, sizeof(options));
options.content_type = &type;
options.no_cache = 1;
options.keep_error = 1;
http_ret = http_get_strbuf(refs_url, &buffer, &options);
switch (http_ret) {
case HTTP_OK:
break;