mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-01-20 14:34:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

avoid to use error that shadows the function name, use err instead.

Browse Source 
builtin-apply.c and builtin-push.c uses a local variable called 'error'
which shadows the error() function.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Pierre Habouzit 2006-08-23 12:39:10 +02:00 committed by Junio C Hamano
parent b05faa2da9
commit 60b7f38e0e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-apply.c
View File

@ -1907,13 +1907,13 @@ static int check_patch(struct patch *patch, struct patch *prev_patch)
static int check_patch_list(struct patch *patch)
{
struct patch *prev_patch = NULL;
int error = 0;
int err = 0;
for (prev_patch = NULL; patch ; patch = patch->next) {
error |= check_patch(patch, prev_patch);
err |= check_patch(patch, prev_patch);
prev_patch = patch;
}
return error;
return err;
}
static void show_index_list(struct patch *list)

10
builtin-push.c
View File

@ -232,7 +232,7 @@ static int do_push(const char *repo)
common_argc = argc;
for (i = 0; i < n; i++) {
int error;
int err;
int dest_argc = common_argc;
int dest_refspec_nr = refspec_nr;
const char **dest_refspec = refspec;
@ -248,10 +248,10 @@ static int do_push(const char *repo)
while (dest_refspec_nr--)
argv[dest_argc++] = *dest_refspec++;
argv[dest_argc] = NULL;
error = run_command_v(argc, argv);
if (!error)
err = run_command_v(argc, argv);
if (!err)
continue;
switch (error) {
switch (err) {
case -ERR_RUN_COMMAND_FORK:
die("unable to fork for %s", sender);
case -ERR_RUN_COMMAND_EXEC:
@ -262,7 +262,7 @@ static int do_push(const char *repo)
case -ERR_RUN_COMMAND_WAITPID_NOEXIT:
die("%s died with strange error", sender);
default:
return -error;
return -err;
}
}
return 0;