##// END OF EJS Templates
xdiff: remove unused xpp and xecfg parameters...
Jun Wu -
r36842:f0d9811d default
parent child Browse files
Show More
@@ -1012,7 +1012,7 b' void xdl_free_script(xdchange_t *xscr) {'
1012 * inside the differential hunk according to the specified configuration.
1012 * inside the differential hunk according to the specified configuration.
1013 * Also advance xscr if the first changes must be discarded.
1013 * Also advance xscr if the first changes must be discarded.
1014 */
1014 */
1015 xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg)
1015 xdchange_t *xdl_get_hunk(xdchange_t **xscr)
1016 {
1016 {
1017 xdchange_t *xch, *xchp, *lxch;
1017 xdchange_t *xch, *xchp, *lxch;
1018 int64_t max_common = 0;
1018 int64_t max_common = 0;
@@ -1070,7 +1070,7 b' static int xdl_call_hunk_func(xdfenv_t *'
1070 if ((xecfg->flags & XDL_EMIT_BDIFFHUNK) != 0) {
1070 if ((xecfg->flags & XDL_EMIT_BDIFFHUNK) != 0) {
1071 int64_t i1 = 0, i2 = 0, n1 = xe->xdf1.nrec, n2 = xe->xdf2.nrec;
1071 int64_t i1 = 0, i2 = 0, n1 = xe->xdf1.nrec, n2 = xe->xdf2.nrec;
1072 for (xch = xscr; xch; xch = xche->next) {
1072 for (xch = xscr; xch; xch = xche->next) {
1073 xche = xdl_get_hunk(&xch, xecfg);
1073 xche = xdl_get_hunk(&xch);
1074 if (!xch)
1074 if (!xch)
1075 break;
1075 break;
1076 if (xch != xche)
1076 if (xch != xche)
@@ -1089,7 +1089,7 b' static int xdl_call_hunk_func(xdfenv_t *'
1089 return -1;
1089 return -1;
1090 } else {
1090 } else {
1091 for (xch = xscr; xch; xch = xche->next) {
1091 for (xch = xscr; xch; xch = xche->next) {
1092 xche = xdl_get_hunk(&xch, xecfg);
1092 xche = xdl_get_hunk(&xch);
1093 if (!xch)
1093 if (!xch)
1094 break;
1094 break;
1095 if (xecfg->hunk_func(xch->i1 + p,
1095 if (xecfg->hunk_func(xch->i1 + p,
@@ -56,7 +56,7 b' static int xdl_init_classifier(xdlclassi'
56 static void xdl_free_classifier(xdlclassifier_t *cf);
56 static void xdl_free_classifier(xdlclassifier_t *cf);
57 static int xdl_classify_record(unsigned int pass, xdlclassifier_t *cf, xrecord_t **rhash,
57 static int xdl_classify_record(unsigned int pass, xdlclassifier_t *cf, xrecord_t **rhash,
58 unsigned int hbits, xrecord_t *rec);
58 unsigned int hbits, xrecord_t *rec);
59 static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, int64_t narec, xpparam_t const *xpp,
59 static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, int64_t narec,
60 xdlclassifier_t *cf, xdfile_t *xdf);
60 xdlclassifier_t *cf, xdfile_t *xdf);
61 static void xdl_free_ctx(xdfile_t *xdf);
61 static void xdl_free_ctx(xdfile_t *xdf);
62 static int xdl_clean_mmatch(char const *dis, int64_t i, int64_t s, int64_t e);
62 static int xdl_clean_mmatch(char const *dis, int64_t i, int64_t s, int64_t e);
@@ -237,7 +237,7 b' static void xdl_trim_files(mmfile_t *mf1'
237 }
237 }
238
238
239
239
240 static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, int64_t narec, xpparam_t const *xpp,
240 static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, int64_t narec,
241 xdlclassifier_t *cf, xdfile_t *xdf) {
241 xdlclassifier_t *cf, xdfile_t *xdf) {
242 unsigned int hbits;
242 unsigned int hbits;
243 int64_t nrec, hsize, bsize;
243 int64_t nrec, hsize, bsize;
@@ -356,12 +356,12 b' int xdl_prepare_env(mmfile_t *mf1, mmfil'
356
356
357 xdl_trim_files(mf1, mf2, TRIM_RESERVED_LINES, xe, &tmf1, &tmf2);
357 xdl_trim_files(mf1, mf2, TRIM_RESERVED_LINES, xe, &tmf1, &tmf2);
358
358
359 if (xdl_prepare_ctx(1, &tmf1, enl1, xpp, &cf, &xe->xdf1) < 0) {
359 if (xdl_prepare_ctx(1, &tmf1, enl1, &cf, &xe->xdf1) < 0) {
360
360
361 xdl_free_classifier(&cf);
361 xdl_free_classifier(&cf);
362 return -1;
362 return -1;
363 }
363 }
364 if (xdl_prepare_ctx(2, &tmf2, enl2, xpp, &cf, &xe->xdf2) < 0) {
364 if (xdl_prepare_ctx(2, &tmf2, enl2, &cf, &xe->xdf2) < 0) {
365
365
366 xdl_free_ctx(&xe->xdf1);
366 xdl_free_ctx(&xe->xdf1);
367 xdl_free_classifier(&cf);
367 xdl_free_classifier(&cf);
General Comments 0
You need to be logged in to leave comments. Login now