commit, merge: initialize static strbuf

[git.git] / xdiff-interface.c

diff --git a/xdiff-interface.c b/xdiff-interface.c
index 9ee877c6f4d281ad86c8760aa9ee7b4289f647ac..61dc5c547019776b971dc89d009f628bbac134fd 100644 (file)
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -115,17 +115,20 @@ static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx)
        char *bp = b->ptr + b->size;
        long smaller = (a->size < b->size) ? a->size : b->size;
 
+       if (ctx)
+               return;
+
        while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) {
                trimmed += blk;
                ap -= blk;
                bp -= blk;
        }
 
-       while (recovered < trimmed && 0 <= ctx)
+       while (recovered < trimmed)
                if (ap[recovered++] == '\n')
-                       ctx--;
-       a->size -= (trimmed - recovered);
-       b->size -= (trimmed - recovered);
+                       break;
+       a->size -= trimmed - recovered;
+       b->size -= trimmed - recovered;
 }
 
 int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *xecb)
@@ -149,8 +152,8 @@ int read_mmfile(mmfile_t *ptr, const char *filename)
        if ((f = fopen(filename, "rb")) == NULL)
                return error("Could not open %s", filename);
        sz = xsize_t(st.st_size);
-       ptr->ptr = xmalloc(sz);
-       if (fread(ptr->ptr, sz, 1, f) != 1)
+       ptr->ptr = xmalloc(sz ? sz : 1);
+       if (sz && fread(ptr->ptr, sz, 1, f) != 1)
                return error("Could not read %s", filename);
        fclose(f);
        ptr->size = sz;
@@ -230,8 +233,7 @@ void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value)
                        expression = value;
                if (regcomp(&reg->re, expression, 0))
                        die("Invalid regexp to look for hunk header: %s", expression);
-               if (buffer)
-                       free(buffer);
+               free(buffer);
                value = ep + 1;
        }
 }