undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2008-01-19 00:42:22 -08:00
parent 7a2078b4b0
commit c89fb6b19a
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builtin-apply.c
View File

@ -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)
@ -1461,8 +1472,7 @@ static int find_offset(const char *buf, unsigned long size,
}
/* Exact line number? */
if ((start + fragsize <= size) &&
!memcmp(buf + start, fragment, fragsize))
if (match_fragment(buf, size, start, fragment, fragsize))
return start;
/*
@ -1494,9 +1504,7 @@ static int find_offset(const char *buf, unsigned long size,
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)