diffcore-pickaxe: remove fill_one()

fill_one is _almost_ identical to just calling fill_textconv; the
exception is that for the !DIFF_FILE_VALID case, fill_textconv gives us
an empty buffer rather than a NULL one. Since we currently use the NULL
pointer as a signal that the file is not present on one side of the
diff, we must now switch to using DIFF_FILE_VALID to make the same
check.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Simon Ruderich <simon@ruderich.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 8f955f87ef3341fbc322a1394a25b11955499bc7..3124f49dc3544012633e5c696bbed5fbd1fa2eb4 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -74,16 +74,6 @@ static void diffgrep_consume(void *priv, char *line, unsigned long len)
        line[len] = hold;
 }
 
-static void fill_one(struct diff_filespec *one,
-                    mmfile_t *mf, struct userdiff_driver *textconv)
-{
-       if (DIFF_FILE_VALID(one)) {
-               mf->size = fill_textconv(textconv, one, &mf->ptr);
-       } else {
-               memset(mf, 0, sizeof(*mf));
-       }
-}
-
 static int diff_grep(struct diff_filepair *p, struct diff_options *o,
                     regex_t *regexp, kwset_t kws)
 {
@@ -99,15 +89,15 @@ static int diff_grep(struct diff_filepair *p, struct diff_options *o,
        textconv_one = get_textconv(p->one);
        textconv_two = get_textconv(p->two);
 
-       fill_one(p->one, &mf1, textconv_one);
-       fill_one(p->two, &mf2, textconv_two);
+       mf1.size = fill_textconv(textconv_one, p->one, &mf1.ptr);
+       mf2.size = fill_textconv(textconv_two, p->two, &mf2.ptr);
 
-       if (!mf1.ptr) {
-               if (!mf2.ptr)
+       if (!DIFF_FILE_VALID(p->one)) {
+               if (!DIFF_FILE_VALID(p->two))
                        return 0; /* ignore unmerged */
                /* created "two" -- does it have what we are looking for? */
                hit = !regexec(regexp, mf2.ptr, 1, &regmatch, 0);
-       } else if (!mf2.ptr) {
+       } else if (!DIFF_FILE_VALID(p->two)) {
                /* removed "one" -- did it have what we are looking for? */
                hit = !regexec(regexp, mf1.ptr, 1, &regmatch, 0);
        } else {
@@ -224,16 +214,16 @@ static int has_changes(struct diff_filepair *p, struct diff_options *o,
        if (textconv_one == textconv_two && diff_unmodified_pair(p))
                return 0;
 
-       fill_one(p->one, &mf1, textconv_one);
-       fill_one(p->two, &mf2, textconv_two);
+       mf1.size = fill_textconv(textconv_one, p->one, &mf1.ptr);
+       mf2.size = fill_textconv(textconv_two, p->two, &mf2.ptr);
 
-       if (!mf1.ptr) {
-               if (!mf2.ptr)
+       if (!DIFF_FILE_VALID(p->one)) {
+               if (!DIFF_FILE_VALID(p->two))
                        ret = 0; /* ignore unmerged */
                /* created */
                ret = contains(&mf2, o, regexp, kws) != 0;
        }
-       else if (!mf2.ptr) /* removed */
+       else if (!DIFF_FILE_VALID(p->two)) /* removed */
                ret = contains(&mf1, o, regexp, kws) != 0;
        else
                ret = contains(&mf1, o, regexp, kws) !=