diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/rcs/ci.c | 4 | ||||
| -rw-r--r-- | usr.bin/rcs/co.c | 6 | ||||
| -rw-r--r-- | usr.bin/rcs/diff.c | 4 | ||||
| -rw-r--r-- | usr.bin/rcs/diff.h | 6 | ||||
| -rw-r--r-- | usr.bin/rcs/diff3.c | 12 | ||||
| -rw-r--r-- | usr.bin/rcs/rcs.c | 6 | ||||
| -rw-r--r-- | usr.bin/rcs/rcsdiff.c | 6 |
7 files changed, 22 insertions, 22 deletions
diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c index 5c505d09455..a8f3abc0f8a 100644 --- a/usr.bin/rcs/ci.c +++ b/usr.bin/rcs/ci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ci.c,v 1.201 2007/06/30 08:23:49 xsa Exp $ */ +/* $OpenBSD: ci.c,v 1.202 2007/07/03 00:56:23 ray Exp $ */ /* * Copyright (c) 2005, 2006 Niall O'Higgins <niallo@openbsd.org> * All rights reserved. @@ -377,7 +377,7 @@ checkin_diff_file(struct checkin_params *pb) b2 = NULL; diff_format = D_RCSDIFF; - if (rcs_diffreg(path1, path2, b3, 0) == D_ERROR) + if (diffreg(path1, path2, b3, 0) == D_ERROR) goto out; return (b3); diff --git a/usr.bin/rcs/co.c b/usr.bin/rcs/co.c index 669cb113589..12b62905dad 100644 --- a/usr.bin/rcs/co.c +++ b/usr.bin/rcs/co.c @@ -1,4 +1,4 @@ -/* $OpenBSD: co.c,v 1.108 2007/06/30 08:23:49 xsa Exp $ */ +/* $OpenBSD: co.c,v 1.109 2007/07/03 00:56:23 ray Exp $ */ /* * Copyright (c) 2005 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -525,7 +525,7 @@ checkout_err_nobranch(RCSFILE *file, const char *author, const char *date, * checkout_file_has_diffs() * * Check for diffs between the working file and its current revision. - * Same return values as rcs_diffreg() + * Same return values as diffreg() */ static int checkout_file_has_diffs(RCSFILE *rfp, RCSNUM *frev, const char *dst) @@ -550,7 +550,7 @@ checkout_file_has_diffs(RCSFILE *rfp, RCSNUM *frev, const char *dst) rcs_buf_empty(bp); diff_format = D_RCSDIFF; - ret = rcs_diffreg(dst, tempfile, bp, 0); + ret = diffreg(dst, tempfile, bp, 0); rcs_buf_free(bp); unlink(tempfile); diff --git a/usr.bin/rcs/diff.c b/usr.bin/rcs/diff.c index 261067fcc6f..69f8f0f6e57 100644 --- a/usr.bin/rcs/diff.c +++ b/usr.bin/rcs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.23 2007/06/29 05:04:40 ray Exp $ */ +/* $OpenBSD: diff.c,v 1.24 2007/07/03 00:56:23 ray Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -293,7 +293,7 @@ u_char cup2low[256] = { }; int -rcs_diffreg(const char *file1, const char *file2, BUF *out, int flags) +diffreg(const char *file1, const char *file2, BUF *out, int flags) { FILE *f1, *f2; int i, rval; diff --git a/usr.bin/rcs/diff.h b/usr.bin/rcs/diff.h index 817ab08a7ee..cb044ce1750 100644 --- a/usr.bin/rcs/diff.h +++ b/usr.bin/rcs/diff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.h,v 1.6 2007/02/27 07:59:13 xsa Exp $ */ +/* $OpenBSD: diff.h,v 1.7 2007/07/03 00:56:23 ray Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -96,7 +96,7 @@ #define D_IGNOREBLANKS 0x40 /* Ignore white space changes */ /* - * Status values for rcs_diffreg() return values + * Status values for diffreg() return values */ #define D_SAME 0 /* Files are the same */ #define D_DIFFER 1 /* Files are different */ @@ -112,7 +112,7 @@ struct rcs_lines; BUF *rcs_diff3(RCSFILE *, char *, RCSNUM *, RCSNUM *, int); BUF *merge_diff3(char **, int); void diff_output(const char *, ...); -int rcs_diffreg(const char *, const char *, BUF *, int); +int diffreg(const char *, const char *, BUF *, int); int ed_patch_lines(struct rcs_lines *, struct rcs_lines *); extern int diff_context; 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; diff --git a/usr.bin/rcs/rcs.c b/usr.bin/rcs/rcs.c index bb605c7989b..947b85ae2e1 100644 --- a/usr.bin/rcs/rcs.c +++ b/usr.bin/rcs/rcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.c,v 1.40 2007/06/30 08:23:49 xsa Exp $ */ +/* $OpenBSD: rcs.c,v 1.41 2007/07/03 00:56:23 ray Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -1408,8 +1408,8 @@ rcs_rev_remove(RCSFILE *rf, RCSNUM *rev) rcs_buf_free(prevbuf); diff_format = D_RCSDIFF; - if (rcs_diffreg(path_tmp1, path_tmp2, newdiff, 0) == D_ERROR) - errx(1, "rcs_diffreg failed"); + if (diffreg(path_tmp1, path_tmp2, newdiff, 0) == D_ERROR) + errx(1, "diffreg failed"); newdeltatext = newdiff; } else if (nextrdp == NULL && prevrdp != NULL) { diff --git a/usr.bin/rcs/rcsdiff.c b/usr.bin/rcs/rcsdiff.c index 403b9a3fe2d..78239f8f336 100644 --- a/usr.bin/rcs/rcsdiff.c +++ b/usr.bin/rcs/rcsdiff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsdiff.c,v 1.74 2007/06/30 08:23:49 xsa Exp $ */ +/* $OpenBSD: rcsdiff.c,v 1.75 2007/07/03 00:56:23 ray Exp $ */ /* * Copyright (c) 2005 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -349,7 +349,7 @@ rcsdiff_file(RCSFILE *file, RCSNUM *rev, const char *filename, int dflags) if (utimes(path2, (const struct timeval *)&tv2) < 0) warn("utimes"); - ret = rcs_diffreg(path1, path2, NULL, dflags); + ret = diffreg(path1, path2, NULL, dflags); out: if (fd != -1) @@ -430,7 +430,7 @@ rcsdiff_rev(RCSFILE *file, RCSNUM *rev1, RCSNUM *rev2, int dflags) if (utimes(path2, (const struct timeval *)&tv2) < 0) warn("utimes"); - ret = rcs_diffreg(path1, path2, NULL, dflags); + ret = diffreg(path1, path2, NULL, dflags); out: if (b1 != NULL) |