From: Stefan Beller Date: Mon, 25 Apr 2016 18:50:20 GMT Subject: Re: [PATCH 05/83] builtin/apply: extract line_by_line_fuzzy_match() from match_fragment() Message-ID: In-Reply-To: <1461504863-15946-6-git-send-email-chriscool@tuxfamily.org> > @@ -2251,7 +2319,7 @@ static int match_fragment(struct image *img, > int match_beginning, int match_end) > { > int i; > - char *fixed_buf, *buf, *orig, *target; > + char *fixed_buf, *orig, *target; > struct strbuf fixed; > size_t fixed_len, postlen; > int preimage_limit; > @@ -2312,6 +2380,7 @@ static int match_fragment(struct image *img, > * There must be one non-blank context line that match > * a line before the end of img. > */ > + char *buf; patches 1-4 looking good, with no comment from me. Here is the first spot to comment on. It's not clear why we need to declare buf here? Oh wait it is. It's just moved from the start of the function. But why do it in this patch? It seems unrelated to the general intent of the patch. No need to reroll for this nit alone, it just took me a while to figure out it was an unrelated thing. > char *buf_end; > > buf = preimage->buf;