version 1.86, 2006/04/01 20:11:25 |
version 1.87, 2006/04/05 01:38:55 |
|
|
{ |
{ |
int ch; |
int ch; |
|
|
dap = (struct diff_arg *)xmalloc(sizeof(*dap)); |
dap = xmalloc(sizeof(*dap)); |
dap->date1 = dap->date2 = dap->rev1 = dap->rev2 = NULL; |
dap->date1 = dap->date2 = dap->rev1 = dap->rev2 = NULL; |
strlcpy(diffargs, argv[0], sizeof(diffargs)); |
strlcpy(diffargs, argv[0], sizeof(diffargs)); |
|
|
|
|
|
|
member = (int *)file[1]; |
member = (int *)file[1]; |
equiv(sfile[0], slen[0], sfile[1], slen[1], member); |
equiv(sfile[0], slen[0], sfile[1], slen[1], member); |
tmp = xrealloc(member, slen[1] + 2, sizeof(int)); |
tmp = xrealloc(member, slen[1] + 2, sizeof(*member)); |
member = (int *)tmp; |
member = tmp; |
|
|
class = (int *)file[0]; |
class = (int *)file[0]; |
unsort(sfile[0], slen[0], class); |
unsort(sfile[0], slen[0], class); |
tmp = xrealloc(class, slen[0] + 2, sizeof(int)); |
tmp = xrealloc(class, slen[0] + 2, sizeof(*class)); |
class = (int *)tmp; |
class = tmp; |
|
|
klist = xcalloc(slen[0] + 2, sizeof(int)); |
klist = xcalloc(slen[0] + 2, sizeof(*klist)); |
clen = 0; |
clen = 0; |
clistlen = 100; |
clistlen = 100; |
clist = xcalloc(clistlen, sizeof(cand)); |
clist = xcalloc(clistlen, sizeof(*clist)); |
|
|
if ((i = stone(class, slen[0], member, klist)) < 0) |
if ((i = stone(class, slen[0], member, klist)) < 0) |
goto closem; |
goto closem; |
|
|
xfree(member); |
xfree(member); |
xfree(class); |
xfree(class); |
|
|
tmp = xrealloc(J, diff_len[0] + 2, sizeof(int)); |
tmp = xrealloc(J, diff_len[0] + 2, sizeof(*J)); |
J = (int *)tmp; |
J = tmp; |
unravel(klist[i]); |
unravel(klist[i]); |
xfree(clist); |
xfree(clist); |
xfree(klist); |
xfree(klist); |
|
|
tmp = xrealloc(ixold, diff_len[0] + 2, sizeof(long)); |
tmp = xrealloc(ixold, diff_len[0] + 2, sizeof(*ixold)); |
ixold = (long *)tmp; |
ixold = tmp; |
|
|
tmp = xrealloc(ixnew, diff_len[1] + 2, sizeof(long)); |
tmp = xrealloc(ixnew, diff_len[1] + 2, sizeof(*ixnew)); |
ixnew = (long *)tmp; |
ixnew = tmp; |
check(f1, f2); |
check(f1, f2); |
output(f1, f2); |
output(f1, f2); |
|
|
|
|
if (sz < 100) |
if (sz < 100) |
sz = 100; |
sz = 100; |
|
|
p = (struct line *)xcalloc(sz + 3, sizeof(struct line)); |
p = xcalloc(sz + 3, sizeof(*p)); |
for (j = 0; (h = readhash(fd));) { |
for (j = 0; (h = readhash(fd));) { |
if (j == (int)sz) { |
if (j == (int)sz) { |
sz = sz * 3 / 2; |
sz = sz * 3 / 2; |
tmp = xrealloc(p, sz + 3, sizeof(struct line)); |
tmp = xrealloc(p, sz + 3, sizeof(*p)); |
p = (struct line *)tmp; |
p = tmp; |
} |
} |
p[++j].value = h; |
p[++j].value = h; |
} |
} |
|
|
|
|
if (clen == clistlen) { |
if (clen == clistlen) { |
newclistlen = clistlen * 11 / 10; |
newclistlen = clistlen * 11 / 10; |
tmp = xrealloc(clist, newclistlen, sizeof(cand)); |
tmp = xrealloc(clist, newclistlen, sizeof(*clist)); |
clist = tmp; |
clist = tmp; |
clistlen = newclistlen; |
clistlen = newclistlen; |
} |
} |
|
|
{ |
{ |
int *a, i; |
int *a, i; |
|
|
a = (int *)xcalloc(l + 1, sizeof(int)); |
a = xcalloc(l + 1, sizeof(*a)); |
for (i = 1; i <= l; i++) |
for (i = 1; i <= l; i++) |
a[f[i].serial] = f[i].value; |
a[f[i].serial] = f[i].value; |
for (i = 1; i <= l; i++) |
for (i = 1; i <= l; i++) |
|
|
ptrdiff_t offset = context_vec_ptr - context_vec_start; |
ptrdiff_t offset = context_vec_ptr - context_vec_start; |
max_context <<= 1; |
max_context <<= 1; |
tmp = xrealloc(context_vec_start, max_context, |
tmp = xrealloc(context_vec_start, max_context, |
sizeof(struct context_vec)); |
sizeof(*context_vec_start)); |
context_vec_start = tmp; |
context_vec_start = tmp; |
context_vec_end = context_vec_start + max_context; |
context_vec_end = context_vec_start + max_context; |
context_vec_ptr = context_vec_start + offset; |
context_vec_ptr = context_vec_start + offset; |