avoid to use error that shadows the function name, use err instead.
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>
Pierre Habouzit committed
Aug 23, 2006 at 12:39 UTC
60b7f38e0e08867b72022de5c20715d8eb72de24
2 files changed
+8
-8
builtin-apply.c
+3
-3
@@ -1907,13 +1907,13 @@ static int check_patch(struct patch *patch, struct patch *prev_patch)
1907
static int check_patch_list(struct patch *patch)
1908
{
1909
struct patch *prev_patch = NULL;
1910
- int error = 0;
1910
+ int err = 0;
1911
1912
for (prev_patch = NULL; patch ; patch = patch->next) {
1913
- error |= check_patch(patch, prev_patch);
1913
+ err |= check_patch(patch, prev_patch);
1914
prev_patch = patch;
1915
}
1916
- return error;
1916
+ return err;
1917
}
1918
1919
static void show_index_list(struct patch *list)
builtin-push.c
+5
-5
@@ -232,7 +232,7 @@ static int do_push(const char *repo)
232
common_argc = argc;
233
234
for (i = 0; i < n; i++) {
235
- int error;
235
+ int err;
236
int dest_argc = common_argc;
237
int dest_refspec_nr = refspec_nr;
238
const char **dest_refspec = refspec;
@@ -248,10 +248,10 @@ static int do_push(const char *repo)
248
while (dest_refspec_nr--)
249
argv[dest_argc++] = *dest_refspec++;
250
argv[dest_argc] = NULL;
251
- error = run_command_v(argc, argv);
252
- if (!error)
251
+ err = run_command_v(argc, argv);
252
+ if (!err)
253
continue;
254
- switch (error) {
254
+ switch (err) {
255
case -ERR_RUN_COMMAND_FORK:
256
die("unable to fork for %s", sender);
257
case -ERR_RUN_COMMAND_EXEC:
@@ -262,7 +262,7 @@ static int do_push(const char *repo)
262
case -ERR_RUN_COMMAND_WAITPID_NOEXIT:
263
die("%s died with strange error", sender);
264
default:
265
- return -error;
265
+ return -err;
266
}
267
}
268
return 0;