diff options
| author |   nicm <nicm@openbsd.org> | 2015-11-05 09:48:21 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2015-11-05 09:48:21 +0000 |
| commit | 397ddb8a3f80a7c0fc96b9834bf9a6841845ed3c (patch) | |
| tree | 06e55ca92968a883778543a5aed67fa1e57f9996 /usr.bin/cvs/diff3.c | |
| parent | "commandline" -> "command line", since there are so few examples (diff) | |
| download | wireguard-openbsd-397ddb8a3f80a7c0fc96b9834bf9a6841845ed3c.tar.xz wireguard-openbsd-397ddb8a3f80a7c0fc96b9834bf9a6841845ed3c.zip | |
Remove xfree(), like already done for RCS. From Michael W Bombardieri,
ok mmcc
Diffstat (limited to 'usr.bin/cvs/diff3.c')
| -rw-r--r-- | usr.bin/cvs/diff3.c | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c index 3a601e430d0..d7842404b78 100644 --- a/usr.bin/cvs/diff3.c +++ b/usr.bin/cvs/diff3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.58 2015/09/05 09:47:08 jsg Exp $ */ +/* $OpenBSD: diff3.c,v 1.59 2015/11/05 09:48:21 nicm Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -257,20 +257,19 @@ cvs_merge_file(struct cvs_file *cf, int verbose) cvs_freelines(dlines); - if (data != NULL) - xfree(data); - xfree(patch); + free(data); + free(patch); for (i = 0; i < 3; i++) fclose(fp[i]); worklist_run(&temp_files, worklist_unlink); - xfree(path1); - xfree(path2); - xfree(path3); - xfree(dp13); - xfree(dp23); + free(path1); + free(path2); + free(path3); + free(dp13); + free(dp23); } static int @@ -291,17 +290,12 @@ diff3_internal(int argc, char **argv, const char *fmark, const char *rmark) szchanges = 0; memset(last, 0, sizeof(last)); memset(cline, 0, sizeof(cline)); - if (d13 != NULL) - xfree(d13); - if (d23 != NULL) - xfree(d23); - if (overlap != NULL) - xfree(overlap); - if (de != NULL) - xfree(de); - - overlap = NULL; - de = d13 = d23 = NULL; + free(d13); + free(d23); + free(overlap); + free(de); + + de = d13 = d23 = overlap = NULL; increase(); |