D2764: xdiff: remove unused xpp and xecfg parameters
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG2e2b48cca761: xdiff: remove unused xpp and xecfg parameters
(authored by quark, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2764?vs=6801=6807
REVISION DETAIL
https://phab.mercurial-scm.org/D2764
AFFECTED FILES
mercurial/thirdparty/xdiff/xdiffi.c
mercurial/thirdparty/xdiff/xprepare.c
CHANGE DETAILS
diff --git a/mercurial/thirdparty/xdiff/xprepare.c
b/mercurial/thirdparty/xdiff/xprepare.c
--- a/mercurial/thirdparty/xdiff/xprepare.c
+++ b/mercurial/thirdparty/xdiff/xprepare.c
@@ -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, , );
- if (xdl_prepare_ctx(1, , enl1, xpp, , >xdf1) < 0) {
+ if (xdl_prepare_ctx(1, , enl1, , >xdf1) < 0) {
xdl_free_classifier();
return -1;
}
- if (xdl_prepare_ctx(2, , enl2, xpp, , >xdf2) < 0) {
+ if (xdl_prepare_ctx(2, , enl2, , >xdf2) < 0) {
xdl_free_ctx(>xdf1);
xdl_free_classifier();
diff --git a/mercurial/thirdparty/xdiff/xdiffi.c
b/mercurial/thirdparty/xdiff/xdiffi.c
--- a/mercurial/thirdparty/xdiff/xdiffi.c
+++ b/mercurial/thirdparty/xdiff/xdiffi.c
@@ -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(, xecfg);
+ xche = xdl_get_hunk();
if (!xch)
break;
if (xch != xche)
@@ -1089,7 +1089,7 @@
return -1;
} else {
for (xch = xscr; xch; xch = xche->next) {
- xche = xdl_get_hunk(, xecfg);
+ xche = xdl_get_hunk();
if (!xch)
break;
if (xecfg->hunk_func(xch->i1 + p,
To: quark, #hg-reviewers, indygreg
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D2764: xdiff: remove unused xpp and xecfg parameters
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
They are unused. Thus removed.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2764
AFFECTED FILES
mercurial/thirdparty/xdiff/xdiffi.c
mercurial/thirdparty/xdiff/xprepare.c
CHANGE DETAILS
diff --git a/mercurial/thirdparty/xdiff/xprepare.c
b/mercurial/thirdparty/xdiff/xprepare.c
--- a/mercurial/thirdparty/xdiff/xprepare.c
+++ b/mercurial/thirdparty/xdiff/xprepare.c
@@ -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, , );
- if (xdl_prepare_ctx(1, , enl1, xpp, , >xdf1) < 0) {
+ if (xdl_prepare_ctx(1, , enl1, , >xdf1) < 0) {
xdl_free_classifier();
return -1;
}
- if (xdl_prepare_ctx(2, , enl2, xpp, , >xdf2) < 0) {
+ if (xdl_prepare_ctx(2, , enl2, , >xdf2) < 0) {
xdl_free_ctx(>xdf1);
xdl_free_classifier();
diff --git a/mercurial/thirdparty/xdiff/xdiffi.c
b/mercurial/thirdparty/xdiff/xdiffi.c
--- a/mercurial/thirdparty/xdiff/xdiffi.c
+++ b/mercurial/thirdparty/xdiff/xdiffi.c
@@ -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(, xecfg);
+ xche = xdl_get_hunk();
if (!xch)
break;
if (xch != xche)
@@ -1089,7 +1089,7 @@
return -1;
} else {
for (xch = xscr; xch; xch = xche->next) {
- xche = xdl_get_hunk(, xecfg);
+ xche = xdl_get_hunk();
if (!xch)
break;
if (xecfg->hunk_func(xch->i1 + p,
To: quark, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
