undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetch: rename file-scope global "transport" to "gtransport"

Browse Source 
Although many functions in this file take a "struct transport" as a
parameter, "fetch_one()" assigns to the global singleton instance
which is a file-scope static, in order to allow a parameterless
signal handler unlock_pack() to access it.

Rename the variable to gtransport to make sure these uses stand out.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2013-08-07 15:38:45 -07:00
parent b9ccf55e06
commit af23445925
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
builtin/fetch.c
View File

@ -36,7 +36,7 @@ static int tags = TAGS_DEFAULT, unshallow;
static const char *depth; static const char *depth;
static const char *upload_pack; static const char *upload_pack;
static struct strbuf default_rla = STRBUF_INIT; static struct strbuf default_rla = STRBUF_INIT;
static struct transport *transport; static struct transport *gtransport;
static const char *submodule_prefix = ""; static const char *submodule_prefix = "";
static const char *recurse_submodules_default; static const char *recurse_submodules_default;
@ -95,8 +95,8 @@ static struct option builtin_fetch_options[] = {
static void unlock_pack(void) static void unlock_pack(void)
{ {
if (transport) if (gtransport)
transport_unlock_pack(transport); transport_unlock_pack(gtransport);
} }
static void unlock_pack_on_signal(int signo) static void unlock_pack_on_signal(int signo)
@ -818,13 +818,13 @@ static int do_fetch(struct transport *transport,
static void set_option(const char *name, const char *value) static void set_option(const char *name, const char *value)
{ {
int r = transport_set_option(transport, name, value); int r = transport_set_option(gtransport, name, value);
if (r < 0) if (r < 0)
die(_("Option \"%s\" value \"%s\" is not valid for %s"), die(_("Option \"%s\" value \"%s\" is not valid for %s"),
name, value, transport->url); name, value, gtransport->url);
if (r > 0) if (r > 0)
warning(_("Option \"%s\" is ignored for %s\n"), warning(_("Option \"%s\" is ignored for %s\n"),
name, transport->url); name, gtransport->url);
} }
static int get_one_remote_for_fetch(struct remote *remote, void *priv) static int get_one_remote_for_fetch(struct remote *remote, void *priv)
@ -949,8 +949,8 @@ static int fetch_one(struct remote *remote, int argc, const char **argv)
die(_("No remote repository specified. Please, specify either a URL or a\n" die(_("No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched.")); "remote name from which new revisions should be fetched."));
transport = transport_get(remote, NULL); gtransport = transport_get(remote, NULL);
transport_set_verbosity(transport, verbosity, progress); transport_set_verbosity(gtransport, verbosity, progress);
if (upload_pack) if (upload_pack)
set_option(TRANS_OPT_UPLOADPACK, upload_pack); set_option(TRANS_OPT_UPLOADPACK, upload_pack);
if (keep) if (keep)
@ -983,10 +983,10 @@ static int fetch_one(struct remote *remote, int argc, const char **argv)
sigchain_push_common(unlock_pack_on_signal); sigchain_push_common(unlock_pack_on_signal);
atexit(unlock_pack); atexit(unlock_pack);
refspec = parse_fetch_refspec(ref_nr, refs); refspec = parse_fetch_refspec(ref_nr, refs);
exit_code = do_fetch(transport, refspec, ref_nr); exit_code = do_fetch(gtransport, refspec, ref_nr);
free_refspec(ref_nr, refspec); free_refspec(ref_nr, refspec);
transport_disconnect(transport); transport_disconnect(gtransport);
transport = NULL; gtransport = NULL;
return exit_code; return exit_code;
} }