From 2b3873ff34ff937dad729407da4308be6a5bcd66 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ren=C3=A9=20Scharfe?= Date: Sun, 20 May 2012 16:32:54 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- grep.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/grep.c b/grep.c index 2b77c47764..c35a7ce57d 100644 --- a/grep.c +++ b/grep.c @@ -18,14 +18,19 @@ static struct grep_pat *create_grep_pat(const char *pat, size_t patlen, 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, enum grep_header_field field, const char *pat) { struct grep_pat *p = create_grep_pat(pat, strlen(pat), "header", 0, GREP_PATTERN_HEAD, field); - *opt->header_tail = p; - opt->header_tail = &p->next; - p->next = NULL; + do_append_grep_pat(&opt->header_tail, p); } 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) { struct grep_pat *p = create_grep_pat(pat, patlen, origin, no, t, 0); - *opt->pattern_tail = p; - opt->pattern_tail = &p->next; - p->next = NULL; + do_append_grep_pat(&opt->pattern_tail, p); } struct grep_opt *grep_opt_dup(const struct grep_opt *opt) -- 2.11.4.GIT