diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:30 -0800 |
| commit | 043478308feec3cda9b3473bc0b79396cb9d4db6 (patch) | |
| tree | 59e92b4034e40876a6abfaccdef9a121679d51e8 /builtin/apply.c | |
| parent | a06f23c7393d187be3ded662102ec2b7b1b28bd0 (diff) | |
| parent | 4f1c0b21e9045ff12e1880b5724a032031716a24 (diff) | |
| download | git-043478308feec3cda9b3473bc0b79396cb9d4db6.tar.gz git-043478308feec3cda9b3473bc0b79396cb9d4db6.tar.xz | |
Merge branch 'ep/varscope'
Shrink lifetime of variables by moving their definitions to an
inner scope where appropriate.
* ep/varscope:
builtin/gc.c: reduce scope of variables
builtin/fetch.c: reduce scope of variable
builtin/commit.c: reduce scope of variables
builtin/clean.c: reduce scope of variable
builtin/blame.c: reduce scope of variables
builtin/apply.c: reduce scope of variables
bisect.c: reduce scope of variable
Diffstat (limited to 'builtin/apply.c')
| -rw-r--r-- | builtin/apply.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index b0d098622..a7e72d57a 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -1943,13 +1943,7 @@ static int parse_chunk(char *buffer, unsigned long size, struct patch *patch) size - offset - hdrsize, patch); if (!patchsize) { - static const char *binhdr[] = { - "Binary files ", - "Files ", - NULL, - }; static const char git_binary[] = "GIT binary patch\n"; - int i; int hd = hdrsize + offset; unsigned long llen = linelen(buffer + hd, size - hd); @@ -1965,6 +1959,12 @@ static int parse_chunk(char *buffer, unsigned long size, struct patch *patch) patchsize = 0; } else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) { + static const char *binhdr[] = { + "Binary files ", + "Files ", + NULL, + }; + int i; for (i = 0; binhdr[i]; i++) { int len = strlen(binhdr[i]); if (len < size - hd && |