diff options
| author |   deraadt <deraadt@openbsd.org> | 2014-12-01 21:58:46 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2014-12-01 21:58:46 +0000 |
| commit | caa2ffb0b03850db17af0f8c10b96ed868191c3f (patch) | |
| tree | e4a3ca634b548c220db17e0f4f17351d7a2dd572 /usr.bin/cvs/diff_internals.c | |
| parent | reconvert (rereconvert?) to memcpy except in the one case where memmove (diff) | |
| download | wireguard-openbsd-caa2ffb0b03850db17af0f8c10b96ed868191c3f.tar.xz wireguard-openbsd-caa2ffb0b03850db17af0f8c10b96ed868191c3f.zip | |
An internal function called xrealloc() is actually a fail-hard
reallocarray()... so rename it.
Diffstat (limited to 'usr.bin/cvs/diff_internals.c')
| -rw-r--r-- | usr.bin/cvs/diff_internals.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/cvs/diff_internals.c b/usr.bin/cvs/diff_internals.c index b451422dd07..706415acbb5 100644 --- a/usr.bin/cvs/diff_internals.c +++ b/usr.bin/cvs/diff_internals.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff_internals.c,v 1.34 2011/04/01 17:25:26 nicm Exp $ */ +/* $OpenBSD: diff_internals.c,v 1.35 2014/12/01 21:58:46 deraadt Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -377,11 +377,11 @@ diffreg(const char *file1, const char *file2, int _fd1, int _fd2, member = (int *)file[1]; equiv(sfile[0], slen[0], sfile[1], slen[1], member); - member = xrealloc(member, slen[1] + 2, sizeof(*member)); + member = xreallocarray(member, slen[1] + 2, sizeof(*member)); class = (int *)file[0]; unsort(sfile[0], slen[0], class); - class = xrealloc(class, slen[0] + 2, sizeof(*class)); + class = xreallocarray(class, slen[0] + 2, sizeof(*class)); klist = xcalloc(slen[0] + 2, sizeof(*klist)); clen = 0; @@ -391,13 +391,13 @@ diffreg(const char *file1, const char *file2, int _fd1, int _fd2, xfree(member); xfree(class); - J = xrealloc(J, len[0] + 2, sizeof(*J)); + J = xreallocarray(J, len[0] + 2, sizeof(*J)); unravel(klist[i]); xfree(clist); xfree(klist); - ixold = xrealloc(ixold, len[0] + 2, sizeof(*ixold)); - ixnew = xrealloc(ixnew, len[1] + 2, sizeof(*ixnew)); + ixold = xreallocarray(ixold, len[0] + 2, sizeof(*ixold)); + ixnew = xreallocarray(ixnew, len[1] + 2, sizeof(*ixnew)); check(f1, f2, flags); output(f1, f2, flags); @@ -458,7 +458,7 @@ prepare(int i, FILE *fd, off_t filesize, int flags) for (j = 0; (h = readhash(fd, flags));) { if (j == sz) { sz = sz * 3 / 2; - p = xrealloc(p, sz + 3, sizeof(*p)); + p = xreallocarray(p, sz + 3, sizeof(*p)); } p[++j].value = h; } @@ -589,7 +589,7 @@ newcand(int x, int y, int pred) if (clen == clistlen) { clistlen = clistlen * 11 / 10; - clist = xrealloc(clist, clistlen, sizeof(*clist)); + clist = xreallocarray(clist, clistlen, sizeof(*clist)); } q = clist + clen; q->x = x; @@ -999,7 +999,7 @@ proceed: if (context_vec_ptr == context_vec_end - 1) { ptrdiff_t offset = context_vec_ptr - context_vec_start; max_context <<= 1; - context_vec_start = xrealloc(context_vec_start, + context_vec_start = xreallocarray(context_vec_start, max_context, sizeof(*context_vec_start)); context_vec_end = context_vec_start + max_context; context_vec_ptr = context_vec_start + offset; |