builtin-apply.c: refactor small part that matches context

This moves three "if" conditions out of line from find_offset()
function, which is responsible for finding the matching place in
the preimage to apply the patch.  There is no change in the
logic of the program.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-apply.c b/builtin-apply.c
index 15432b6782400b556333ee4117c7daaff20412ab..2c052f80e5296377eca6079bbe72adea43a1cfaa 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -1437,6 +1437,17 @@ static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)
        }
 }
 
        }
 }
 

+static int match_fragment(const char *buf, unsigned long size,
+                         unsigned long try,
+                         const char *fragment, unsigned long fragsize)
+{
+       if (try + fragsize > size)
+               return 0;
+       if (memcmp(buf + try, fragment, fragsize))
+               return 0;
+       return 1;
+}
+

 static int find_offset(const char *buf, unsigned long size,
                       const char *fragment, unsigned long fragsize,
                       int line, int *lines)
 static int find_offset(const char *buf, unsigned long size,
                       const char *fragment, unsigned long fragsize,
                       int line, int *lines)


@@ -1461,8 +1472,7 @@ static int find_offset(const char *buf, unsigned long size,
        }
 
        /* Exact line number? */
        }
 
        /* Exact line number? */

-       if ((start + fragsize <= size) &&
-           !memcmp(buf + start, fragment, fragsize))
+       if (match_fragment(buf, size, start, fragment, fragsize))

                return start;
 
        /*
                return start;
 
        /*


@@ -1494,9 +1504,7 @@ static int find_offset(const char *buf, unsigned long size,
                        try = forwards;
                }
 
                        try = forwards;
                }
 

-               if (try + fragsize > size)
-                       continue;
-               if (memcmp(buf + try, fragment, fragsize))
+               if (!match_fragment(buf, size, try, fragment, fragsize))

                        continue;
                n = (i >> 1)+1;
                if (i & 1)
                        continue;
                n = (i >> 1)+1;
                if (i & 1)