Browse Source

Merge branch 'jk/suppress-clang-warning'

* jk/suppress-clang-warning:
  fix clang -Wtautological-compare with unsigned enum
maint
Junio C Hamano 12 years ago
parent
commit
edb99f95f5
  1. 3
      grep.c
  2. 3
      grep.h

3
grep.c

@ -625,7 +625,8 @@ static struct grep_expr *prep_header_patterns(struct grep_opt *opt) @@ -625,7 +625,8 @@ static struct grep_expr *prep_header_patterns(struct grep_opt *opt)
for (p = opt->header_list; p; p = p->next) {
if (p->token != GREP_PATTERN_HEAD)
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);
compile_regexp(p, opt);
}

3
grep.h

@ -28,7 +28,8 @@ enum grep_context { @@ -28,7 +28,8 @@ enum grep_context {
};

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_REFLOG,


Loading…
Cancel
Save