Mercurial > hg-stable

changeset 36832:f0d9811dda8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
xdiff: remove unused xpp and xecfg parameters They are unused. Thus removed. Differential Revision: https://phab.mercurial-scm.org/D2764
author Jun Wu <quark@fb.com>
date Fri, 09 Mar 2018 14:39:35 -0800
parents 49fe6249937a
children f1ef0e53e628
files mercurial/thirdparty/xdiff/xdiffi.c mercurial/thirdparty/xdiff/xprepare.c
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/thirdparty/xdiff/xdiffi.c	Fri Mar 09 14:37:55 2018 -0800
+++ b/mercurial/thirdparty/xdiff/xdiffi.c	Fri Mar 09 14:39:35 2018 -0800
@@ -1012,7 +1012,7 @@
  * inside the differential hunk according to the specified configuration.
  * Also advance xscr if the first changes must be discarded.
  */
-xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg)
+xdchange_t *xdl_get_hunk(xdchange_t **xscr)
 {
 	xdchange_t *xch, *xchp, *lxch;
 	int64_t max_common = 0;
@@ -1070,7 +1070,7 @@
 	if ((xecfg->flags & XDL_EMIT_BDIFFHUNK) != 0) {
 		int64_t i1 = 0, i2 = 0, n1 = xe->xdf1.nrec, n2 = xe->xdf2.nrec;
 		for (xch = xscr; xch; xch = xche->next) {
-			xche = xdl_get_hunk(&xch, xecfg);
+			xche = xdl_get_hunk(&xch);
 			if (!xch)
 				break;
 			if (xch != xche)
@@ -1089,7 +1089,7 @@
 			return -1;
 	} else {
 		for (xch = xscr; xch; xch = xche->next) {
-			xche = xdl_get_hunk(&xch, xecfg);
+			xche = xdl_get_hunk(&xch);
 			if (!xch)
 				break;
 			if (xecfg->hunk_func(xch->i1 + p,
--- a/mercurial/thirdparty/xdiff/xprepare.c	Fri Mar 09 14:37:55 2018 -0800
+++ b/mercurial/thirdparty/xdiff/xprepare.c	Fri Mar 09 14:39:35 2018 -0800
@@ -56,7 +56,7 @@
 static void xdl_free_classifier(xdlclassifier_t *cf);
 static int xdl_classify_record(unsigned int pass, xdlclassifier_t *cf, xrecord_t **rhash,
 			       unsigned int hbits, xrecord_t *rec);
-static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, int64_t narec, xpparam_t const *xpp,
+static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, int64_t narec,
 			   xdlclassifier_t *cf, xdfile_t *xdf);
 static void xdl_free_ctx(xdfile_t *xdf);
 static int xdl_clean_mmatch(char const *dis, int64_t i, int64_t s, int64_t e);
@@ -237,7 +237,7 @@
 }
 
 
-static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, int64_t narec, xpparam_t const *xpp,
+static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, int64_t narec,
 			   xdlclassifier_t *cf, xdfile_t *xdf) {
 	unsigned int hbits;
 	int64_t nrec, hsize, bsize;
@@ -356,12 +356,12 @@
 
 	xdl_trim_files(mf1, mf2, TRIM_RESERVED_LINES, xe, &tmf1, &tmf2);
 
-	if (xdl_prepare_ctx(1, &tmf1, enl1, xpp, &cf, &xe->xdf1) < 0) {
+	if (xdl_prepare_ctx(1, &tmf1, enl1, &cf, &xe->xdf1) < 0) {
 
 		xdl_free_classifier(&cf);
 		return -1;
 	}
-	if (xdl_prepare_ctx(2, &tmf2, enl2, xpp, &cf, &xe->xdf2) < 0) {
+	if (xdl_prepare_ctx(2, &tmf2, enl2, &cf, &xe->xdf2) < 0) {
 
 		xdl_free_ctx(&xe->xdf1);
 		xdl_free_classifier(&cf);