1 /* $OpenBSD: diff3.c,v 1.41 2016/10/18 21:06:52 millert Exp $ */
4 * Copyright (C) Caldera International Inc. 2001-2002.
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
10 * 1. Redistributions of source code and documentation must retain the above
11 * copyright notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution.
15 * 3. All advertising materials mentioning features or use of this software
16 * must display the following acknowledgement:
17 * This product includes software developed or owned by Caldera
19 * 4. Neither the name of Caldera International, Inc. nor the names of other
20 * contributors may be used to endorse or promote products derived from
21 * this software without specific prior written permission.
23 * USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
24 * INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
25 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
26 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
27 * IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT,
28 * INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
29 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
30 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
32 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
33 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34 * POSSIBILITY OF SUCH DAMAGE.
37 * Copyright (c) 1991, 1993
38 * The Regents of the University of California. All rights reserved.
40 * Redistribution and use in source and binary forms, with or without
41 * modification, are permitted provided that the following conditions
43 * 1. Redistributions of source code must retain the above copyright
44 * notice, this list of conditions and the following disclaimer.
45 * 2. Redistributions in binary form must reproduce the above copyright
46 * notice, this list of conditions and the following disclaimer in the
47 * documentation and/or other materials provided with the distribution.
48 * 3. Neither the name of the University nor the names of its contributors
49 * may be used to endorse or promote products derived from this software
50 * without specific prior written permission.
52 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
53 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
54 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
55 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
56 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
57 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
58 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
59 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
60 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
61 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
64 * @(#)diff3.c 8.1 (Berkeley) 6/6/93
68 #include <sys/queue.h>
79 #include "got_error.h"
80 #include "got_opentemp.h"
81 #include "got_object.h"
85 #include "got_lib_diff.h"
89 #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
92 /* diff3 - 3-way differential file comparison */
94 /* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3]
96 * d13 = diff report on f1 vs f3
97 * d23 = diff report on f2 vs f3
98 * f1, f2, f3 the 3 files
99 * if changes in f1 overlap with changes in f3, m1 and m3 are used
100 * to mark the overlaps; otherwise, the file names f1 and f3 are used
101 * (only for options E and X).
105 * "from" is first in range of changed lines; "to" is last+1
106 * from=to=line after point of insertion for added lines.
125 * "de" is used to gather editing scripts. These are later spewed out
126 * in reverse order. Its first element must be all zero, the "new"
127 * component of "de" contains line positions or byte positions
128 * depending on when you look (!?). Array overlap indicates which
129 * sections in "de" correspond to lines that are different in all
136 int cline[3]; /* # of the last-read line in each file (0-2) */
139 * the latest known correspondence between line numbers of the 3 files
140 * is stored in last[1-3];
145 char f1mark[PATH_MAX], f3mark[PATH_MAX]; /* markers for -E and -X */
153 static int duplicate(struct range *, struct range *, struct diff3_state *);
154 static int edit(struct diff *, int, int, struct diff3_state *);
155 static char *getchange(FILE *, struct diff3_state *);
156 static char *get_line(FILE *, size_t *, struct diff3_state *);
157 static int number(char **);
158 static const struct got_error *readin(size_t *, char *, struct diff **,
159 struct diff3_state *);
160 static int ed_patch_lines(struct rcs_lines *, struct rcs_lines *);
161 static int skip(int, int, char *, struct diff3_state *);
162 static int edscript(int, struct diff3_state *);
163 static int merge(size_t, size_t, struct diff3_state *);
164 static void change(int, struct range *, int, struct diff3_state *);
165 static void keep(int, struct range *, struct diff3_state *);
166 static void prange(struct range *, struct diff3_state *);
167 static void repos(int, struct diff3_state *);
168 static void separate(const char *, struct diff3_state *);
169 static const struct got_error *increase(struct diff3_state *);
170 static const struct got_error *diff3_internal(char *, char *, char *,
171 char *, char *, const char *, const char *, struct diff3_state *,
172 const char *, const char *);
174 static const struct got_error *
175 diff_output(BUF *diffbuf, const char *fmt, ...)
183 i = vasprintf(&str, fmt, vap);
186 return got_error_from_errno("vasprintf");
187 buf_append(&newsize, diffbuf, str, strlen(str));
192 static const struct got_error*
193 diffreg(BUF **d, const char *path1, const char *path2)
195 const struct got_error *err = NULL;
196 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
197 char *outpath = NULL;
198 struct got_diff_state ds;
199 struct got_diff_args args;
204 f1 = fopen(path1, "r");
206 err = got_error_from_errno2("fopen", path1);
209 f2 = fopen(path2, "r");
211 err = got_error_from_errno2("fopen", path2);
215 err = got_opentemp_named(&outpath, &outfile, "/tmp/got-diffreg");
219 memset(&ds, 0, sizeof(ds));
220 /* XXX should stat buffers be passed in args instead of ds? */
221 if (stat(path1, &ds.stb1) == -1) {
222 err = got_error_from_errno2("stat", path1);
225 if (stat(path2, &ds.stb2) == -1) {
226 err = got_error_from_errno2("stat", path2);
230 memset(&args, 0, sizeof(args));
231 args.diff_format = D_NORMAL;
234 args.diff_context = 0;
236 err = got_diffreg(&res, f1, f2, D_FORCEASCII, &args, &ds,
241 if (fflush(outfile) != 0) {
242 err = got_error_from_errno2("fflush", outpath);
246 *d = buf_load(outpath);
248 err = got_error_from_errno("buf_load");
254 if (outfile && fclose(outfile) != 0 && err == NULL)
255 err = got_error_from_errno("fclose");
256 if (f1 && fclose(f1) != 0 && err == NULL)
257 err = got_error_from_errno("fclose");
258 if (f2 && fclose(f2) != 0 && err == NULL)
259 err = got_error_from_errno("fclose");
266 const struct got_error *
267 got_merge_diff3(int *overlapcnt, int outfd, const char *p1, const char *p2,
268 const char *p3, const char *label1, const char *label3)
270 const struct got_error *err = NULL;
271 char *dp13, *dp23, *path1, *path2, *path3;
272 BUF *b1, *b2, *b3, *d1, *d2, *diffb;
273 u_char *data, *patch;
275 struct wklhead temp_files;
276 struct diff3_state *d3s;
281 SLIST_INIT(&temp_files);
283 d3s = calloc(1, sizeof(*d3s));
285 return got_error_from_errno("calloc");
286 d3s->eflag = 3; /* default -E for compatibility with former RCS */
288 b1 = b2 = b3 = d1 = d2 = diffb = NULL;
289 dp13 = dp23 = path1 = path2 = path3 = NULL;
292 if ((b1 = buf_load(p1)) == NULL)
294 if ((b2 = buf_load(p2)) == NULL)
296 if ((b3 = buf_load(p3)) == NULL)
299 diffb = buf_alloc(128);
301 if (asprintf(&path1, "/tmp/got-diff1.XXXXXXXX") == -1) {
302 err = got_error_from_errno("asprintf");
305 if (asprintf(&path2, "/tmp/got-diff2.XXXXXXXX") == -1) {
306 err = got_error_from_errno("asprintf");
309 if (asprintf(&path3, "/tmp/got-diff3.XXXXXXXX") == -1) {
310 err = got_error_from_errno("asprintf");
314 err = buf_write_stmp(b1, path1, &temp_files);
317 err = buf_write_stmp(b2, path2, &temp_files);
320 err = buf_write_stmp(b3, path3, &temp_files);
327 err = diffreg(&d1, path1, path3);
334 err = diffreg(&d2, path2, path3);
341 if (asprintf(&dp13, "/tmp/got-d13.XXXXXXXXXX") == -1) {
342 err = got_error_from_errno("asprintf");
345 err = buf_write_stmp(d1, dp13, &temp_files);
352 if (asprintf(&dp23, "/tmp/got-d23.XXXXXXXXXX") == -1) {
353 err = got_error_from_errno("asprintf");
356 err = buf_write_stmp(d2, dp23, &temp_files);
363 d3s->diffbuf = diffb;
364 err = diff3_internal(dp13, dp23, path1, path2, path3,
365 label1, label3, d3s, label1, label3);
372 plen = buf_len(diffb);
373 patch = buf_release(diffb);
375 data = buf_release(b1);
377 diffb = rcs_patchfile(data, dlen, patch, plen, ed_patch_lines);
398 worklist_clean(&temp_files, worklist_unlink);
400 for (i = 0; i < nitems(d3s->fp); i++) {
401 if (d3s->fp[i] && fclose(d3s->fp[i]) != 0 && err == NULL)
402 err = got_error_from_errno("fclose");
404 if (err == NULL && diffb) {
405 if (buf_write_fd(diffb, outfd) < 0)
406 err = got_error_from_errno("buf_write_fd");
407 *overlapcnt = d3s->overlapcnt;
414 static const struct got_error *
415 diff3_internal(char *dp13, char *dp23, char *path1, char *path2, char *path3,
416 const char *fmark, const char *rmark, struct diff3_state *d3s,
417 const char *label1, const char *label3)
419 const struct got_error *err = NULL;
423 i = snprintf(d3s->f1mark, sizeof(d3s->f1mark),
424 "%s %s", GOT_DIFF_CONFLICT_MARKER_BEGIN, label1);
425 if (i < 0 || i >= (int)sizeof(d3s->f1mark))
426 return got_error(GOT_ERR_NO_SPACE);
428 i = snprintf(d3s->f3mark, sizeof(d3s->f3mark),
429 "%s %s", GOT_DIFF_CONFLICT_MARKER_END, label3);
430 if (i < 0 || i >= (int)sizeof(d3s->f3mark))
431 return got_error(GOT_ERR_NO_SPACE);
437 err = readin(&m, dp13, &d3s->d13, d3s);
440 err = readin(&n, dp23, &d3s->d23, d3s);
444 if ((d3s->fp[0] = fopen(path1, "r")) == NULL)
445 return got_error_from_errno2("fopen", path1);
446 if ((d3s->fp[1] = fopen(path2, "r")) == NULL)
447 return got_error_from_errno2("fopen", path2);
448 if ((d3s->fp[2] = fopen(path3, "r")) == NULL)
449 return got_error_from_errno2("fopen", path3);
451 if (merge(m, n, d3s) < 0)
452 return got_error_from_errno("merge");
457 ed_patch_lines(struct rcs_lines *dlines, struct rcs_lines *plines)
460 struct rcs_line *sort, *lp, *dlp, *ndlp, *insert_after;
461 int start, end, i, lineno;
464 dlp = TAILQ_FIRST(&(dlines->l_lines));
465 lp = TAILQ_FIRST(&(plines->l_lines));
468 for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
469 lp = TAILQ_NEXT(lp, l_list)) {
470 /* Skip blank lines */
474 /* NUL-terminate line buffer for strtol() safety. */
475 tmp = lp->l_line[lp->l_len - 1];
476 lp->l_line[lp->l_len - 1] = '\0';
478 /* len - 1 is NUL terminator so we use len - 2 for 'op' */
479 op = lp->l_line[lp->l_len - 2];
480 start = (int)strtol(lp->l_line, &ep, 10);
482 /* Restore the last byte of the buffer */
483 lp->l_line[lp->l_len - 1] = tmp;
486 if (start > dlines->l_nblines ||
487 start < 0 || *ep != 'a')
489 } else if (op == 'c') {
490 if (start > dlines->l_nblines ||
491 start < 0 || (*ep != ',' && *ep != 'c'))
496 end = (int)strtol(ep, &ep, 10);
497 if (end < 0 || *ep != 'c')
508 if (dlp->l_lineno == start)
510 if (dlp->l_lineno > start) {
511 dlp = TAILQ_PREV(dlp, tqh, l_list);
512 } else if (dlp->l_lineno < start) {
513 ndlp = TAILQ_NEXT(dlp, l_list);
514 if (ndlp->l_lineno > start)
525 insert_after = TAILQ_PREV(dlp, tqh, l_list);
526 for (i = 0; i <= (end - start); i++) {
527 ndlp = TAILQ_NEXT(dlp, l_list);
528 TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
534 if (op == 'a' || op == 'c') {
537 lp = TAILQ_NEXT(lp, l_list);
541 if (lp->l_len == 2 &&
542 lp->l_line[0] == '.' &&
543 lp->l_line[1] == '\n')
546 TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
547 TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
551 lp->l_lineno = start;
557 * always resort lines as the markers might be put at the
558 * same line as we first started editing.
561 TAILQ_FOREACH(sort, &(dlines->l_lines), l_list)
562 sort->l_lineno = lineno++;
563 dlines->l_nblines = lineno - 1;
570 * Pick up the line numbers of all changes from one change file.
571 * (This puts the numbers in a vector, which is not strictly necessary,
572 * since the vector is processed in one sequential pass.
573 * The vector could be optimized out of existence)
575 static const struct got_error *
576 readin(size_t *n, char *name, struct diff **dd, struct diff3_state *d3s)
578 const struct got_error *err = NULL;
585 d3s->fp[0] = fopen(name, "r");
586 if (d3s->fp[0] == NULL)
587 return got_error_from_errno2("fopen", name);
588 for (i = 0; (p = getchange(d3s->fp[0], d3s)); i++) {
589 if (i >= d3s->szchanges - 1) {
611 (*dd)[i].old.from = a;
613 (*dd)[i].new.from = c;
618 (*dd)[i].old.from = (*dd)[i-1].old.to;
619 (*dd)[i].new.from = (*dd)[i-1].new.to;
622 if (fclose(d3s->fp[0]) != 0)
623 err = got_error_from_errno("fclose");
635 while (isdigit((unsigned char)(**lc)))
636 nn = nn*10 + *(*lc)++ - '0';
642 getchange(FILE *b, struct diff3_state *d3s)
646 while ((line = get_line(b, NULL, d3s))) {
647 if (isdigit((unsigned char)line[0]))
655 get_line(FILE *b, size_t *n, struct diff3_state *d3s)
663 len = getline(&cp, &size, b);
667 if (cp[len - 1] != '\n') {
669 if (len + 1 > size) {
670 new = realloc(cp, len + 1);
690 merge(size_t m1, size_t m2, struct diff3_state *d3s)
692 struct diff *d1, *d2, *d3;
699 t1 = (d1 < d3s->d13 + m1);
700 t2 = (d2 < d3s->d23 + m2);
705 printf("%d,%d=%d,%d %d,%d=%d,%d\n",
706 d1->old.from, d1->old.to,
707 d1->new.from, d1->new.to,
708 d2->old.from, d2->old.to,
709 d2->new.from, d2->new.to);
712 /* first file is different from others */
713 if (!t2 || (t1 && d1->new.to < d2->new.from)) {
714 /* stuff peculiar to 1st file */
715 if (d3s->eflag == 0) {
717 change(1, &d1->old, 0, d3s);
718 keep(2, &d1->new, d3s);
719 change(3, &d1->new, 0, d3s);
725 /* second file is different from others */
726 if (!t1 || (t2 && d2->new.to < d1->new.from)) {
727 if (d3s->eflag == 0) {
729 keep(1, &d2->new, d3s);
730 change(2, &d2->old, 0, d3s);
731 change(3, &d2->new, 0, d3s);
738 * Merge overlapping changes in first file
739 * this happens after extension (see below).
741 if (d1 + 1 < d3s->d13 + m1 && d1->new.to >= d1[1].new.from) {
742 d1[1].old.from = d1->old.from;
743 d1[1].new.from = d1->new.from;
748 /* merge overlapping changes in second */
749 if (d2 + 1 < d3s->d23 + m2 && d2->new.to >= d2[1].new.from) {
750 d2[1].old.from = d2->old.from;
751 d2[1].new.from = d2->new.from;
755 /* stuff peculiar to third file or different in all */
756 if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
757 dpl = duplicate(&d1->old, &d2->old, d3s);
762 * dpl = 0 means all files differ
763 * dpl = 1 means files 1 and 2 identical
765 if (d3s->eflag == 0) {
766 separate(dpl ? "3" : "", d3s);
767 change(1, &d1->old, dpl, d3s);
768 change(2, &d2->old, 0, d3s);
769 d3 = d1->old.to > d1->old.from ? d1 : d2;
770 change(3, &d3->new, 0, d3s);
772 j = edit(d1, dpl, j, d3s);
779 * Overlapping changes from file 1 and 2; extend changes
780 * appropriately to make them coincide.
782 if (d1->new.from < d2->new.from) {
783 d2->old.from -= d2->new.from-d1->new.from;
784 d2->new.from = d1->new.from;
785 } else if (d2->new.from < d1->new.from) {
786 d1->old.from -= d1->new.from-d2->new.from;
787 d1->new.from = d2->new.from;
789 if (d1->new.to > d2->new.to) {
790 d2->old.to += d1->new.to - d2->new.to;
791 d2->new.to = d1->new.to;
792 } else if (d2->new.to > d1->new.to) {
793 d1->old.to += d2->new.to - d1->new.to;
794 d1->new.to = d2->new.to;
798 return (edscript(j, d3s));
802 separate(const char *s, struct diff3_state *d3s)
804 diff_output(d3s->diffbuf, "====%s\n", s);
808 * The range of lines rold.from thru rold.to in file i is to be changed.
809 * It is to be printed only if it does not duplicate something to be
813 change(int i, struct range *rold, int fdup, struct diff3_state *d3s)
815 diff_output(d3s->diffbuf, "%d:", i);
816 d3s->last[i] = rold->to;
818 if (fdup || d3s->debug)
821 (void)skip(i, rold->from, NULL, d3s);
822 (void)skip(i, rold->to, " ", d3s);
826 * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
829 prange(struct range *rold, struct diff3_state *d3s)
831 if (rold->to <= rold->from)
832 diff_output(d3s->diffbuf, "%da\n", rold->from - 1);
834 diff_output(d3s->diffbuf, "%d", rold->from);
835 if (rold->to > rold->from+1)
836 diff_output(d3s->diffbuf, ",%d", rold->to - 1);
837 diff_output(d3s->diffbuf, "c\n");
842 * No difference was reported by diff between file 1 (or 2) and file 3,
843 * and an artificial dummy difference (trange) must be ginned up to
844 * correspond to the change reported in the other file.
847 keep(int i, struct range *rnew, struct diff3_state *d3s)
852 delta = d3s->last[3] - d3s->last[i];
853 trange.from = rnew->from - delta;
854 trange.to = rnew->to - delta;
855 change(i, &trange, 1, d3s);
859 * skip to just before line number from in file "i". If "pr" is non-NULL,
860 * print all skipped stuff with string pr as a prefix.
863 skip(int i, int from, char *pr, struct diff3_state *d3s)
868 for (n = 0; d3s->cline[i] < from - 1; n += j) {
869 if ((line = get_line(d3s->fp[i], &j, d3s)) == NULL)
872 diff_output(d3s->diffbuf, "%s%s", pr, line);
879 * Return 1 or 0 according as the old range (in file 1) contains exactly
880 * the same data as the new range (in file 2).
883 duplicate(struct range *r1, struct range *r2, struct diff3_state *d3s)
889 if (r1->to-r1->from != r2->to-r2->from)
891 (void)skip(0, r1->from, NULL, d3s);
892 (void)skip(1, r2->from, NULL, d3s);
894 for (nline=0; nline < r1->to - r1->from; nline++) {
896 c = getc(d3s->fp[0]);
897 d = getc(d3s->fp[1]);
898 if (c == -1 || d== -1)
912 repos(int nchar, struct diff3_state *d3s)
916 for (i = 0; i < 2; i++)
917 (void)fseek(d3s->fp[i], (long)-nchar, SEEK_CUR);
921 * collect an editing script for later regurgitation
924 edit(struct diff *diff, int fdup, int j, struct diff3_state *d3s)
926 if (((fdup + 1) & d3s->eflag) == 0)
929 d3s->overlap[j] = !fdup;
932 d3s->de[j].old.from = diff->old.from;
933 d3s->de[j].old.to = diff->old.to;
934 d3s->de[j].new.from =
935 d3s->de[j-1].new.to + skip(2, diff->new.from, NULL, d3s);
937 d3s->de[j].new.from + skip(2, diff->new.to, NULL, d3s);
943 edscript(int n, struct diff3_state *d3s)
946 char block[BUFSIZ+1];
949 if (!d3s->overlap[n])
950 prange(&d3s->de[n].old, d3s);
952 diff_output(d3s->diffbuf, "%da\n%s\n",
953 d3s->de[n].old.to -1, GOT_DIFF_CONFLICT_MARKER_SEP);
954 (void)fseek(d3s->fp[2], (long)d3s->de[n].new.from, SEEK_SET);
955 k = d3s->de[n].new.to - d3s->de[n].new.from;
956 for (; k > 0; k-= j) {
957 j = k > BUFSIZ ? BUFSIZ : k;
958 if (fread(block, 1, j, d3s->fp[2]) != (size_t)j)
961 diff_output(d3s->diffbuf, "%s", block);
964 if (!d3s->overlap[n])
965 diff_output(d3s->diffbuf, ".\n");
967 diff_output(d3s->diffbuf, "%s\n.\n", d3s->f3mark);
968 diff_output(d3s->diffbuf, "%da\n%s\n.\n",
969 d3s->de[n].old.from - 1, d3s->f1mark);
973 return (d3s->overlapcnt);
976 static const struct got_error *
977 increase(struct diff3_state *d3s)
983 /* are the memset(3) calls needed? */
984 newsz = d3s->szchanges == 0 ? 64 : 2 * d3s->szchanges;
985 incr = newsz - d3s->szchanges;
987 d = reallocarray(d3s->d13, newsz, sizeof(*d3s->d13));
989 return got_error_from_errno("reallocarray");
991 memset(d3s->d13 + d3s->szchanges, 0, incr * sizeof(*d3s->d13));
993 d = reallocarray(d3s->d23, newsz, sizeof(*d3s->d23));
995 return got_error_from_errno("reallocarray");
997 memset(d3s->d23 + d3s->szchanges, 0, incr * sizeof(*d3s->d23));
999 d = reallocarray(d3s->de, newsz, sizeof(*d3s->de));
1001 return got_error_from_errno("reallocarray");
1003 memset(d3s->de + d3s->szchanges, 0, incr * sizeof(*d3s->de));
1005 s = reallocarray(d3s->overlap, newsz, sizeof(*d3s->overlap));
1007 return got_error_from_errno("reallocarray");
1009 memset(d3s->overlap + d3s->szchanges, 0, incr * sizeof(*d3s->overlap));
1010 d3s->szchanges = newsz;