undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grep: grep: refactor handling of binary mode options

Browse Source 
Turn the switch inside-out and add labels for each possible value
of ->binary.  This makes the code easier to read and avoids calling
buffer_is_binary() if the option -a was given.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2010-05-22 23:28:17 +02:00 committed by Junio C Hamano
parent aca20dd558
commit 64fcec78b5
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
grep.c
View File

@ -800,17 +800,19 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
opt->show_hunk_mark = 1; opt->show_hunk_mark = 1;
opt->last_shown = 0; opt->last_shown = 0;
if (buffer_is_binary(buf, size)) { switch (opt->binary) {
switch (opt->binary) { case GREP_BINARY_DEFAULT:
case GREP_BINARY_DEFAULT: if (buffer_is_binary(buf, size))
binary_match_only = 1; binary_match_only = 1;
break; break;
case GREP_BINARY_NOMATCH: case GREP_BINARY_NOMATCH:
if (buffer_is_binary(buf, size))
return 0; /* Assume unmatch */ return 0; /* Assume unmatch */
break; break;
default: case GREP_BINARY_TEXT:
break; break;
} default:
die("bug: unknown binary handling mode");
} }
memset(&xecfg, 0, sizeof(xecfg)); memset(&xecfg, 0, sizeof(xecfg));