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

xdiff: do away with xdl_mmfile_next()

Browse Source 
Given our simple mmfile structure, xdl_mmfile_next() calls are
redundant. Do away with calls to them.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Tay Ray Chuan 2011-08-01 12:20:07 +08:00 committed by Junio C Hamano
parent 286e2b1a23
commit 739864b1ff
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xdiff/xdiff.h
View File

@ -106,7 +106,6 @@ typedef struct s_bdiffparam {
#define xdl_realloc(ptr,x) realloc(ptr,x) #define xdl_realloc(ptr,x) realloc(ptr,x)
void *xdl_mmfile_first(mmfile_t *mmf, long *size); void *xdl_mmfile_first(mmfile_t *mmf, long *size);
void *xdl_mmfile_next(mmfile_t *mmf, long *size);
long xdl_mmfile_size(mmfile_t *mmf); long xdl_mmfile_size(mmfile_t *mmf);
int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,

7
xdiff/xprepare.c
View File

@ -168,12 +168,7 @@ static int xdl_prepare_ctx(mmfile_t *mf, long narec, xpparam_t const *xpp,
nrec = 0; nrec = 0;
if ((cur = blk = xdl_mmfile_first(mf, &bsize)) != NULL) { if ((cur = blk = xdl_mmfile_first(mf, &bsize)) != NULL) {
for (top = blk + bsize;;) { for (top = blk + bsize; cur < top; ) {
if (cur >= top) {
if (!(cur = blk = xdl_mmfile_next(mf, &bsize)))
break;
top = blk + bsize;
}
prev = cur; prev = cur;
hav = xdl_hash_record(&cur, top, xpp->flags); hav = xdl_hash_record(&cur, top, xpp->flags);
if (nrec >= narec) { if (nrec >= narec) {

14
xdiff/xutils.c
View File

@ -67,12 +67,6 @@ void *xdl_mmfile_first(mmfile_t *mmf, long *size)
} }
void *xdl_mmfile_next(mmfile_t *mmf, long *size)
{
return NULL;
}
long xdl_mmfile_size(mmfile_t *mmf) long xdl_mmfile_size(mmfile_t *mmf)
{ {
return mmf->size; return mmf->size;
@ -160,13 +154,7 @@ long xdl_guess_lines(mmfile_t *mf, long sample) {
char const *data, *cur, *top; char const *data, *cur, *top;
if ((cur = data = xdl_mmfile_first(mf, &size)) != NULL) { if ((cur = data = xdl_mmfile_first(mf, &size)) != NULL) {
for (top = data + size; nl < sample;) { for (top = data + size; nl < sample && cur < top; ) {
if (cur >= top) {
tsize += (long) (cur - data);
if (!(cur = data = xdl_mmfile_next(mf, &size)))
break;
top = data + size;
}
nl++; nl++;
if (!(cur = memchr(cur, '\n', top - cur))) if (!(cur = memchr(cur, '\n', top - cur)))
cur = top; cur = top;