diff options
| author | Ray Lai <ray@cvs.openbsd.org> | 2007-07-03 00:56:24 +0000 |
|---|---|---|
| committer | Ray Lai <ray@cvs.openbsd.org> | 2007-07-03 00:56:24 +0000 |
| commit | 843239cc329250ab93d1ab56ed8cefecb214dea8 (patch) | |
| tree | cd9003da299e83619ac45f05948b9a28f50288fd /usr.bin/rcs/diff3.c | |
| parent | f1d4e8585a71af6fc6918494b948182c0f423582 (diff) | |
Rename rcs_diffreg() to diffreg().
OK joris@
Diffstat (limited to 'usr.bin/rcs/diff3.c')
| -rw-r--r-- | usr.bin/rcs/diff3.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/rcs/diff3.c b/usr.bin/rcs/diff3.c index 6941edc8527..fbe113a8c23 100644 --- a/usr.bin/rcs/diff3.c +++ b/usr.bin/rcs/diff3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.22 2007/06/30 08:23:49 xsa Exp $ */ +/* $OpenBSD: diff3.c,v 1.23 2007/07/03 00:56:23 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.22 2007/06/30 08:23:49 xsa Exp $"; + "$OpenBSD: diff3.c,v 1.23 2007/07/03 00:56:23 ray Exp $"; #endif /* not lint */ #include <ctype.h> @@ -199,8 +199,8 @@ merge_diff3(char **av, int flags) rcs_buf_free(b2); b2 = NULL; - if ((rcs_diffreg(path1, path3, d1, 0) == D_ERROR) || - (rcs_diffreg(path2, path3, d2, 0) == D_ERROR)) { + if ((diffreg(path1, path3, d1, 0) == D_ERROR) || + (diffreg(path2, path3, d2, 0) == D_ERROR)) { rcs_buf_free(diffb); diffb = NULL; goto out; @@ -326,8 +326,8 @@ rcs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2, int flags) rcs_buf_free(b2); b2 = NULL; - if ((rcs_diffreg(path1, path3, d1, 0) == D_ERROR) || - (rcs_diffreg(path2, path3, d2, 0) == D_ERROR)) { + if ((diffreg(path1, path3, d1, 0) == D_ERROR) || + (diffreg(path2, path3, d2, 0) == D_ERROR)) { rcs_buf_free(diffb); diffb = NULL; goto out; |