summaryrefslogtreecommitdiffstats
path: root/differ.c
diff options
context:
space:
mode:
authorThomas Bushnell <tb@debian.org>2006-04-26 23:01:39 -0700
committerBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:05:32 -0800
commit20402610bf881f67b22eb1600340d8284556ae56 (patch)
tree6a19e5a1b2cc22dccd1003787a70b751f7da4763 /differ.c
parent5846f77421a975897a31d6fbf3f520aab385cea3 (diff)
parentae2b295c7deaf2d7c18ad1ed9b6050970e56bae7 (diff)
downloadscm-20402610bf881f67b22eb1600340d8284556ae56.tar.gz
scm-20402610bf881f67b22eb1600340d8284556ae56.zip
Import Debian changes 5e2-1debian/5e2-1
scm (5e2-1) unstable; urgency=low * New upstream release. * Change to continue.h from version 5e1-2 repeated here.
Diffstat (limited to 'differ.c')
-rw-r--r--differ.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/differ.c b/differ.c
index 43b2c3f..cb8cf8f 100644
--- a/differ.c
+++ b/differ.c
@@ -61,7 +61,7 @@ int fp_compare(int *fp,int fpoff,int *cc,void *a,int m,void *b,int n,int_functio
int fp_run(int *fp,int fpoff,int k,void *a,int m,void *b,int n,int_function array_refsEql_P,int *cc,int p);
-int diff_mid_split(int m,int n,int *rr,int *cc,int cost);
+int diff_mid_split(int n,int *rr,int *cc,int cost);
void fp_init(int *fp,int fpoff,int fill,int mindx,int maxdx);
@@ -234,8 +234,7 @@ L_snloop:
}
}
-int diff_mid_split(m, n, rr, cc, cost)
- int m;
+int diff_mid_split(n, rr, cc, cost)
int n;
int *rr;
int *cc;
@@ -313,7 +312,7 @@ int diff_divide_and_conquer(fp, fpoff, ccrr, a, start_a, end_a, b, start_b, end_
fp_init(fp, fpoff, -1, -(1+(p_lim)), 1+(p_lim)+((len_b)-(m2)));
fp_compare(fp, fpoff, rr, procs->subarray(a, mid_a, end_a), m2, procs->subarray(b, start_b, end_b), len_b, procs->array_refs_revEql_P, MIN(p_lim, len_a));
{
- int b_splt = diff_mid_split(len_a, len_b, rr, cc, tcst);
+ int b_splt = diff_mid_split(len_b, rr, cc, tcst);
int est_c = cc[b_splt];
int est_r = rr[(len_b)-(b_splt)];
check_cost("cc", est_c, diff2et(fp, fpoff, ccrr, a, start_a, mid_a, b, start_b, (start_b)+(b_splt), edits, edx, epo, procs, ((est_c)-((b_splt)-((mid_a)-(start_a))))/2));