+15 -15

xdiff/xdiffi.c

··· 278 278 */ 279 279 if (off1 == lim1) { 280 280 for (; off2 < lim2; off2++) 281 281 - xdf2->rchg[xdf2->rindex[off2]] = 1; 281 281 + xdf2->changed[xdf2->rindex[off2]] = 1; 282 282 } else if (off2 == lim2) { 283 283 for (; off1 < lim1; off1++) 284 284 - xdf1->rchg[xdf1->rindex[off1]] = 1; 284 284 + xdf1->changed[xdf1->rindex[off1]] = 1; 285 285 } else { 286 286 xdpsplit_t spl; 287 287 spl.i1 = spl.i2 = 0; ··· 708 708 static void group_init(xdfile_t *xdf, struct xdlgroup *g) 709 709 { 710 710 g->start = g->end = 0; 711 711 - while (xdf->rchg[g->end]) 711 711 + while (xdf->changed[g->end]) 712 712 g->end++; 713 713 } 714 714 ··· 722 722 return -1; 723 723 724 724 g->start = g->end + 1; 725 725 - for (g->end = g->start; xdf->rchg[g->end]; g->end++) 725 725 + for (g->end = g->start; xdf->changed[g->end]; g->end++) 726 726 ; 727 727 728 728 return 0; ··· 738 738 return -1; 739 739 740 740 g->end = g->start - 1; 741 741 - for (g->start = g->end; xdf->rchg[g->start - 1]; g->start--) 741 741 + for (g->start = g->end; xdf->changed[g->start - 1]; g->start--) 742 742 ; 743 743 744 744 return 0; ··· 753 753 { 754 754 if (g->end < xdf->nrec && 755 755 recs_match(&xdf->recs[g->start], &xdf->recs[g->end])) { 756 756 - xdf->rchg[g->start++] = 0; 757 757 - xdf->rchg[g->end++] = 1; 756 756 + xdf->changed[g->start++] = 0; 757 757 + xdf->changed[g->end++] = 1; 758 758 759 759 - while (xdf->rchg[g->end]) 759 759 + while (xdf->changed[g->end]) 760 760 g->end++; 761 761 762 762 return 0; ··· 774 774 { 775 775 if (g->start > 0 && 776 776 recs_match(&xdf->recs[g->start - 1], &xdf->recs[g->end - 1])) { 777 777 - xdf->rchg[--g->start] = 1; 778 778 - xdf->rchg[--g->end] = 0; 777 777 + xdf->changed[--g->start] = 1; 778 778 + xdf->changed[--g->end] = 0; 779 779 780 780 - while (xdf->rchg[g->start - 1]) 780 780 + while (xdf->changed[g->start - 1]) 781 781 g->start--; 782 782 783 783 return 0; ··· 932 932 933 933 int xdl_build_script(xdfenv_t *xe, xdchange_t **xscr) { 934 934 xdchange_t *cscr = NULL, *xch; 935 935 - char *rchg1 = xe->xdf1.rchg, *rchg2 = xe->xdf2.rchg; 935 935 + char *changed1 = xe->xdf1.changed, *changed2 = xe->xdf2.changed; 936 936 long i1, i2, l1, l2; 937 937 938 938 /* 939 939 * Trivial. Collects "groups" of changes and creates an edit script. 940 940 */ 941 941 for (i1 = xe->xdf1.nrec, i2 = xe->xdf2.nrec; i1 >= 0 || i2 >= 0; i1--, i2--) 942 942 - if (rchg1[i1 - 1] || rchg2[i2 - 1]) { 943 943 - for (l1 = i1; rchg1[i1 - 1]; i1--); 944 944 - for (l2 = i2; rchg2[i2 - 1]; i2--); 942 942 + if (changed1[i1 - 1] || changed2[i2 - 1]) { 943 943 + for (l1 = i1; changed1[i1 - 1]; i1--); 944 944 + for (l2 = i2; changed2[i2 - 1]; i2--); 945 945 946 946 if (!(xch = xdl_add_change(cscr, i1, i2, l1 - i1, l2 - i2))) { 947 947 xdl_free_script(cscr);

+4 -4

xdiff/xhistogram.c

··· 318 318 319 319 if (!count1) { 320 320 while(count2--) 321 321 - env->xdf2.rchg[line2++ - 1] = 1; 321 321 + env->xdf2.changed[line2++ - 1] = 1; 322 322 return 0; 323 323 } else if (!count2) { 324 324 while(count1--) 325 325 - env->xdf1.rchg[line1++ - 1] = 1; 325 325 + env->xdf1.changed[line1++ - 1] = 1; 326 326 return 0; 327 327 } 328 328 ··· 335 335 else { 336 336 if (lcs.begin1 == 0 && lcs.begin2 == 0) { 337 337 while (count1--) 338 338 - env->xdf1.rchg[line1++ - 1] = 1; 338 338 + env->xdf1.changed[line1++ - 1] = 1; 339 339 while (count2--) 340 340 - env->xdf2.rchg[line2++ - 1] = 1; 340 340 + env->xdf2.changed[line2++ - 1] = 1; 341 341 result = 0; 342 342 } else { 343 343 result = histogram_diff(xpp, env,

+4 -4

xdiff/xpatience.c

··· 331 331 /* trivial case: one side is empty */ 332 332 if (!count1) { 333 333 while(count2--) 334 334 - env->xdf2.rchg[line2++ - 1] = 1; 334 334 + env->xdf2.changed[line2++ - 1] = 1; 335 335 return 0; 336 336 } else if (!count2) { 337 337 while(count1--) 338 338 - env->xdf1.rchg[line1++ - 1] = 1; 338 338 + env->xdf1.changed[line1++ - 1] = 1; 339 339 return 0; 340 340 } 341 341 ··· 347 347 /* are there any matching lines at all? */ 348 348 if (!map.has_matches) { 349 349 while(count1--) 350 350 - env->xdf1.rchg[line1++ - 1] = 1; 350 350 + env->xdf1.changed[line1++ - 1] = 1; 351 351 while(count2--) 352 352 - env->xdf2.rchg[line2++ - 1] = 1; 352 352 + env->xdf2.changed[line2++ - 1] = 1; 353 353 xdl_free(map.entries); 354 354 return 0; 355 355 }

+6 -6

xdiff/xprepare.c

··· 126 126 static void xdl_free_ctx(xdfile_t *xdf) 127 127 { 128 128 xdl_free(xdf->rindex); 129 129 - xdl_free(xdf->rchg - 1); 129 129 + xdl_free(xdf->changed - 1); 130 130 xdl_free(xdf->recs); 131 131 } 132 132 ··· 139 139 xrecord_t *crec; 140 140 141 141 xdf->rindex = NULL; 142 142 - xdf->rchg = NULL; 142 142 + xdf->changed = NULL; 143 143 xdf->recs = NULL; 144 144 145 145 if (!XDL_ALLOC_ARRAY(xdf->recs, narec)) ··· 161 161 } 162 162 } 163 163 164 164 - if (!XDL_CALLOC_ARRAY(xdf->rchg, xdf->nrec + 2)) 164 164 + if (!XDL_CALLOC_ARRAY(xdf->changed, xdf->nrec + 2)) 165 165 goto abort; 166 166 167 167 if ((XDF_DIFF_ALG(xpp->flags) != XDF_PATIENCE_DIFF) && ··· 170 170 goto abort; 171 171 } 172 172 173 173 - xdf->rchg += 1; 173 173 + xdf->changed += 1; 174 174 xdf->nreff = 0; 175 175 xdf->dstart = 0; 176 176 xdf->dend = xdf->nrec - 1; ··· 287 287 (dis1[i] == 2 && !xdl_clean_mmatch(dis1, i, xdf1->dstart, xdf1->dend))) { 288 288 xdf1->rindex[nreff++] = i; 289 289 } else 290 290 - xdf1->rchg[i] = 1; 290 290 + xdf1->changed[i] = 1; 291 291 } 292 292 xdf1->nreff = nreff; 293 293 ··· 297 297 (dis2[i] == 2 && !xdl_clean_mmatch(dis2, i, xdf2->dstart, xdf2->dend))) { 298 298 xdf2->rindex[nreff++] = i; 299 299 } else 300 300 - xdf2->rchg[i] = 1; 300 300 + xdf2->changed[i] = 1; 301 301 } 302 302 xdf2->nreff = nreff; 303 303

+1 -1

xdiff/xtypes.h

··· 48 48 xrecord_t *recs; 49 49 long nrec; 50 50 long dstart, dend; 51 51 - char *rchg; 51 51 + char *changed; 52 52 long *rindex; 53 53 long nreff; 54 54 } xdfile_t;

+2 -2

xdiff/xutils.c

··· 425 425 if (xdl_do_diff(&subfile1, &subfile2, xpp, &env) < 0) 426 426 return -1; 427 427 428 428 - memcpy(diff_env->xdf1.rchg + line1 - 1, env.xdf1.rchg, count1); 429 429 - memcpy(diff_env->xdf2.rchg + line2 - 1, env.xdf2.rchg, count2); 428 428 + memcpy(diff_env->xdf1.changed + line1 - 1, env.xdf1.changed, count1); 429 429 + memcpy(diff_env->xdf2.changed + line2 - 1, env.xdf2.changed, count2); 430 430 431 431 xdl_free_env(&env); 432 432