summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorPierre Habouzit <madcoder@debian.org>2006-08-23 10:39:10 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-24 01:47:38 (GMT)
commit60b7f38e0e08867b72022de5c20715d8eb72de24 (patch)
treea2aaa9ebf3994e5257a27c18873312246b18c86f /builtin-apply.c
parentb05faa2da9ec24d737bbba47c71e815255f3eaa7 (diff)
downloadgit-60b7f38e0e08867b72022de5c20715d8eb72de24.zip
git-60b7f38e0e08867b72022de5c20715d8eb72de24.tar.gz
git-60b7f38e0e08867b72022de5c20715d8eb72de24.tar.bz2
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>
Diffstat (limited to 'builtin-apply.c')
-rw-r--r--builtin-apply.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index 4f0eef0..5991737 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -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)