diff options
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 0b00a98aa1..b47ccacc2e 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -628,9 +628,7 @@ static char *git_header_name(char *line, int llen) * form. */ for (len = 0 ; ; len++) { - char c = name[len]; - - switch (c) { + switch (name[len]) { default: continue; case '\n': @@ -1944,16 +1942,16 @@ 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) { if (apply_verbosely) say_patch_name(stderr, "Checking patch ", patch, "...\n"); - 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) |