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

Merge branch 'jk/suppress-clang-warning' into maint

Browse Source 
* jk/suppress-clang-warning:
  fix clang -Wtautological-compare with unsigned enum
This commit is contained in:
Junio C Hamano 2013-04-22 11:26:55 -07:00
commit 4aaafdc6f1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
grep.c
View File

@ -625,7 +625,8 @@ static struct grep_expr *prep_header_patterns(struct grep_opt *opt)
for (p = opt->header_list; p; p = p->next) { for (p = opt->header_list; p; p = p->next) {
if (p->token != GREP_PATTERN_HEAD) if (p->token != GREP_PATTERN_HEAD)
die("bug: a non-header pattern in grep header list."); die("bug: a non-header pattern in grep header list.");
if (p->field < 0 || GREP_HEADER_FIELD_MAX <= p->field) if (p->field < GREP_HEADER_FIELD_MIN ||
GREP_HEADER_FIELD_MAX <= p->field)
die("bug: unknown header field %d", p->field); die("bug: unknown header field %d", p->field);
compile_regexp(p, opt); compile_regexp(p, opt);
} }

3
grep.h
View File

@ -28,7 +28,8 @@ enum grep_context {
}; };
enum grep_header_field { enum grep_header_field {
GREP_HEADER_AUTHOR = 0, GREP_HEADER_FIELD_MIN = 0,
GREP_HEADER_AUTHOR = GREP_HEADER_FIELD_MIN,
GREP_HEADER_COMMITTER, GREP_HEADER_COMMITTER,
GREP_HEADER_REFLOG, GREP_HEADER_REFLOG,