diff options
Diffstat (limited to 'usr.bin/cvs/diff_internals.c')
| -rw-r--r-- | usr.bin/cvs/diff_internals.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/usr.bin/cvs/diff_internals.c b/usr.bin/cvs/diff_internals.c index ff5a1e66c2a..07eb2f82b2f 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.37 2015/02/05 12:59:57 millert Exp $ */ +/* $OpenBSD: diff_internals.c,v 1.38 2015/11/05 09:48:21 nicm Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -73,6 +73,7 @@ #include <stddef.h> #include <stdint.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <time.h> #include <unistd.h> @@ -392,13 +393,13 @@ diffreg(const char *file1, const char *file2, int _fd1, int _fd2, clistlen = 100; clist = xcalloc(clistlen, sizeof(*clist)); i = stone(class, slen[0], member, klist, flags); - xfree(member); - xfree(class); + free(member); + free(class); J = xreallocarray(J, len[0] + 2, sizeof(*J)); unravel(klist[i]); - xfree(clist); - xfree(klist); + free(clist); + free(klist); ixold = xreallocarray(ixold, len[0] + 2, sizeof(*ixold)); ixnew = xreallocarray(ixnew, len[1] + 2, sizeof(*ixnew)); @@ -787,7 +788,7 @@ unsort(struct line *f, int l, int *b) a[f[i].serial] = f[i].value; for (i = 1; i <= l; i++) b[i] = a[i]; - xfree(a); + free(a); } static int @@ -878,7 +879,7 @@ ignoreline(char *line) int ret; ret = regexec(&ignore_re, line, 0, NULL, 0); - xfree(line); + free(line); return (ret == 0); /* if it matched, it should be ignored. */ } @@ -1456,5 +1457,5 @@ diff_output(const char *fmt, ...) buf_puts(diffbuf, str); else cvs_printf("%s", str); - xfree(str); + free(str); } |