diff options
| author |   ray <ray@openbsd.org> | 2009-06-07 08:39:13 +0000 |
|---|---|---|
| committer | ray <ray@openbsd.org> | 2009-06-07 08:39:13 +0000 |
| commit | 57003866bf9d794e291e4f346ca84d4e954c9f0d (patch) | |
| tree | 31172ec207533c30e0dfb757d0e9c20d8a1bf39c /usr.bin/cvs/diff.c | |
| parent | Document the gconf2 module. (diff) | |
| download | wireguard-openbsd-57003866bf9d794e291e4f346ca84d4e954c9f0d.tar.xz wireguard-openbsd-57003866bf9d794e291e4f346ca84d4e954c9f0d.zip | |
More cvs/diff/rcs convergence:
1. Mostly variable/function renaming, SIZE_T_MAX->SIZE_MAX, and
spacing.
2. One strchr -> strncspn.
3. diff had a weird thing where it set file[12] = ofile[12] but
never updated file or ofile, then if file and ofile were different
it freed it. I removed it.
OK millert
Diffstat (limited to 'usr.bin/cvs/diff.c')
| -rw-r--r-- | usr.bin/cvs/diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index 89bd7206255..956aa0470a1 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.154 2009/06/06 14:17:27 ray Exp $ */ +/* $OpenBSD: diff.c,v 1.155 2009/06/07 08:39:13 ray Exp $ */ /* * Copyright (c) 2008 Tobias Stoeckmann <tobias@openbsd.org> * Copyright (c) 2006 Joris Vink <joris@openbsd.org> @@ -566,7 +566,7 @@ cvs_diff_local(struct cvs_file *cf) fatal("cannot open %s", CVS_PATH_DEVNULL); } - if (cvs_diffreg(p1 != NULL ? cf->file_path : CVS_PATH_DEVNULL, + if (diffreg(p1 != NULL ? cf->file_path : CVS_PATH_DEVNULL, p2 != NULL ? cf->file_path : CVS_PATH_DEVNULL, fd1, fd2, NULL, dflags) == D_ERROR) fatal("cvs_diff_local: failed to get RCS patch"); |