xdiff: do away with xdl_mmfile_next()
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>
Tay Ray Chuan committed
Aug 1, 2011 at 12:20 UTC
739864b1ffb379120df9cfa4111c4ec20b823cfd
3 files changed
+2
-20
xdiff/xdiff.h
-1
@@ -106,7 +106,6 @@ typedef struct s_bdiffparam {
106
#define xdl_realloc(ptr,x) realloc(ptr,x)
107
108
void *xdl_mmfile_first(mmfile_t *mmf, long *size);
109
-void *xdl_mmfile_next(mmfile_t *mmf, long *size);
109
long xdl_mmfile_size(mmfile_t *mmf);
110
111
int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
xdiff/xprepare.c
+1
-6
@@ -168,12 +168,7 @@ static int xdl_prepare_ctx(mmfile_t *mf, long narec, xpparam_t const *xpp,
168
169
nrec = 0;
170
if ((cur = blk = xdl_mmfile_first(mf, &bsize)) != NULL) {
171
- for (top = blk + bsize;;) {
172
- if (cur >= top) {
173
- if (!(cur = blk = xdl_mmfile_next(mf, &bsize)))
174
- break;
175
- top = blk + bsize;
176
- }
171
+ for (top = blk + bsize; cur < top; ) {
172
prev = cur;
173
hav = xdl_hash_record(&cur, top, xpp->flags);
174
if (nrec >= narec) {
xdiff/xutils.c
+1
-13
@@ -67,12 +67,6 @@ void *xdl_mmfile_first(mmfile_t *mmf, long *size)
67
}
68
69
70
-void *xdl_mmfile_next(mmfile_t *mmf, long *size)
71
-{
72
- return NULL;
73
-}
74
-
75
-
70
long xdl_mmfile_size(mmfile_t *mmf)
71
{
72
return mmf->size;
@@ -160,13 +154,7 @@ long xdl_guess_lines(mmfile_t *mf, long sample) {
154
char const *data, *cur, *top;
155
156
if ((cur = data = xdl_mmfile_first(mf, &size)) != NULL) {
163
- for (top = data + size; nl < sample;) {
164
- if (cur >= top) {
165
- tsize += (long) (cur - data);
166
- if (!(cur = data = xdl_mmfile_next(mf, &size)))
167
- break;
168
- top = data + size;
169
- }
157
+ for (top = data + size; nl < sample && cur < top; ) {
158
nl++;
159
if (!(cur = memchr(cur, '\n', top - cur)))
160
cur = top;