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/commit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usr.bin/cvs/commit.c') diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index 36f2b606c56..31dc8870b81 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.148 2009/06/06 14:17:27 ray Exp $ */ +/* $OpenBSD: commit.c,v 1.149 2009/06/07 08:39:13 ray Exp $ */ /* * Copyright (c) 2006 Joris Vink * Copyright (c) 2006 Xavier Santolaria @@ -760,7 +760,7 @@ commit_diff(struct cvs_file *cf, RCSNUM *rev, int reverse) fd2 = f; } - if (cvs_diffreg(p1, p2, fd1, fd2, b, D_FORCEASCII) == D_ERROR) + if (diffreg(p1, p2, fd1, fd2, b, D_FORCEASCII) == D_ERROR) fatal("commit_diff: failed to get RCS patch"); close(fd1); -- cgit v1.2.3-59-g8ed1b