diff options
| -rw-r--r-- | xdiff/xprepare.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c index 22c44f0683..e6e2c0e1c0 100644 --- a/xdiff/xprepare.c +++ b/xdiff/xprepare.c @@ -32,9 +32,7 @@ typedef struct s_xdlclass { struct s_xdlclass *next; - unsigned long ha; - char const *line; - long size; + xrecord_t rec; long idx; long len1, len2; } xdlclass_t; @@ -93,14 +91,12 @@ static void xdl_free_classifier(xdlclassifier_t *cf) { static int xdl_classify_record(unsigned int pass, xdlclassifier_t *cf, xrecord_t *rec) { long hi; - char const *line; xdlclass_t *rcrec; - line = rec->ptr; hi = (long) XDL_HASHLONG(rec->ha, cf->hbits); for (rcrec = cf->rchash[hi]; rcrec; rcrec = rcrec->next) - if (rcrec->ha == rec->ha && - xdl_recmatch(rcrec->line, rcrec->size, + if (rcrec->rec.ha == rec->ha && + xdl_recmatch(rcrec->rec.ptr, rcrec->rec.size, rec->ptr, rec->size, cf->flags)) break; @@ -113,9 +109,7 @@ static int xdl_classify_record(unsigned int pass, xdlclassifier_t *cf, xrecord_t if (XDL_ALLOC_GROW(cf->rcrecs, cf->count, cf->alloc)) return -1; cf->rcrecs[rcrec->idx] = rcrec; - rcrec->line = line; - rcrec->size = rec->size; - rcrec->ha = rec->ha; + rcrec->rec = *rec; rcrec->len1 = rcrec->len2 = 0; rcrec->next = cf->rchash[hi]; cf->rchash[hi] = rcrec; |