зеркало из https://github.com/microsoft/git.git
grep: factor out do_append_grep_pat()
Add do_append_grep_pat() as a shared function for adding patterns to the header pattern list and the general pattern list. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
fc45675110
Коммит
2b3873ff34
15
grep.c
15
grep.c
|
@ -18,14 +18,19 @@ static struct grep_pat *create_grep_pat(const char *pat, size_t patlen,
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void do_append_grep_pat(struct grep_pat ***tail, struct grep_pat *p)
|
||||||
|
{
|
||||||
|
**tail = p;
|
||||||
|
*tail = &p->next;
|
||||||
|
p->next = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
void append_header_grep_pattern(struct grep_opt *opt,
|
void append_header_grep_pattern(struct grep_opt *opt,
|
||||||
enum grep_header_field field, const char *pat)
|
enum grep_header_field field, const char *pat)
|
||||||
{
|
{
|
||||||
struct grep_pat *p = create_grep_pat(pat, strlen(pat), "header", 0,
|
struct grep_pat *p = create_grep_pat(pat, strlen(pat), "header", 0,
|
||||||
GREP_PATTERN_HEAD, field);
|
GREP_PATTERN_HEAD, field);
|
||||||
*opt->header_tail = p;
|
do_append_grep_pat(&opt->header_tail, p);
|
||||||
opt->header_tail = &p->next;
|
|
||||||
p->next = NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void append_grep_pattern(struct grep_opt *opt, const char *pat,
|
void append_grep_pattern(struct grep_opt *opt, const char *pat,
|
||||||
|
@ -38,9 +43,7 @@ void append_grep_pat(struct grep_opt *opt, const char *pat, size_t patlen,
|
||||||
const char *origin, int no, enum grep_pat_token t)
|
const char *origin, int no, enum grep_pat_token t)
|
||||||
{
|
{
|
||||||
struct grep_pat *p = create_grep_pat(pat, patlen, origin, no, t, 0);
|
struct grep_pat *p = create_grep_pat(pat, patlen, origin, no, t, 0);
|
||||||
*opt->pattern_tail = p;
|
do_append_grep_pat(&opt->pattern_tail, p);
|
||||||
opt->pattern_tail = &p->next;
|
|
||||||
p->next = NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
struct grep_opt *grep_opt_dup(const struct grep_opt *opt)
|
struct grep_opt *grep_opt_dup(const struct grep_opt *opt)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче