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

grep: move is_fixed() earlier to avoid forward declaration

Browse Source 
Move the is_fixed() function which are currently only used in
compile_regexp() earlier so it can be used in the PCRE family of
functions in a later change.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2017-05-25 19:45:30 +00:00 committed by Junio C Hamano
parent 6d4b5747f0
commit 543f1c0cb0
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
grep.c
View File

@ -321,6 +321,18 @@ static NORETURN void compile_regexp_failed(const struct grep_pat *p,
die("%s'%s': %s", where, p->pattern, error); die("%s'%s': %s", where, p->pattern, error);
} }
static int is_fixed(const char *s, size_t len)
{
size_t i;
for (i = 0; i < len; i++) {
if (is_regex_special(s[i]))
return 0;
}
return 1;
}
static int has_null(const char *s, size_t len) static int has_null(const char *s, size_t len)
{ {
/* /*
@ -402,18 +414,6 @@ static void free_pcre1_regexp(struct grep_pat *p)
} }
#endif /* !USE_LIBPCRE1 */ #endif /* !USE_LIBPCRE1 */
static int is_fixed(const char *s, size_t len)
{
size_t i;
for (i = 0; i < len; i++) {
if (is_regex_special(s[i]))
return 0;
}
return 1;
}
static void compile_fixed_regexp(struct grep_pat *p, struct grep_opt *opt) static void compile_fixed_regexp(struct grep_pat *p, struct grep_opt *opt)
{ {
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;