From 57003866bf9d794e291e4f346ca84d4e954c9f0d Mon Sep 17 00:00:00 2001 From: ray Date: Sun, 7 Jun 2009 08:39:13 +0000 Subject: 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 --- usr.bin/cvs/diff3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'usr.bin/cvs/diff3.c') diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c index 87fb9f329d6..91290eaaaa1 100644 --- a/usr.bin/cvs/diff3.c +++ b/usr.bin/cvs/diff3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.49 2009/06/06 14:17:27 ray Exp $ */ +/* $OpenBSD: diff3.c,v 1.50 2009/06/07 08:39:13 ray Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -72,7 +72,7 @@ static const char copyright[] = #ifndef lint static const char rcsid[] = - "$OpenBSD: diff3.c,v 1.49 2009/06/06 14:17:27 ray Exp $"; + "$OpenBSD: diff3.c,v 1.50 2009/06/07 08:39:13 ray Exp $"; #endif /* not lint */ #include @@ -199,8 +199,8 @@ cvs_merge_file(struct cvs_file *cf, int verbose) cvs_printf("Retrieving revision %s\n", r2); fds[4] = rcs_rev_write_stmp(cf->file_rcs, d3rev2, path3, 0); - cvs_diffreg(path1, path3, fds[2], fds[4], d1, D_FORCEASCII); - cvs_diffreg(path2, path3, fds[3], fds[4], d2, D_FORCEASCII); + diffreg(path1, path3, fds[2], fds[4], d1, D_FORCEASCII); + diffreg(path2, path3, fds[3], fds[4], d2, D_FORCEASCII); (void)xasprintf(&dp13, "%s/d13.XXXXXXXXXX", cvs_tmpdir); fds[0] = cvs_buf_write_stmp(d1, dp13, NULL); -- cgit v1.2.3-59-g8ed1b