consistency in variables naming;

2 files changed, 13 insertions, 15 deletions

diff --git a/usr.bin/rcs/co.c b/usr.bin/rcs/co.c
index 83afdf41e22..6b33160e35e 100644
--- a/usr.bin/rcs/co.c
+++ b/usr.bin/rcs/co.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: co.c,v 1.38 2005/11/29 10:55:37 xsa Exp $	*/
+/*	$OpenBSD: co.c,v 1.39 2005/11/29 11:11:39 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -215,9 +215,7 @@ checkout_rev(RCSFILE *file, RCSNUM *frev, const char *dst, int flags,
 	struct stat st;
 	char *content;
 
-	/*
-	 * Check out the latest revision if <frev> is greater than HEAD
-	 */
+	/* Check out the latest revision if <frev> is greater than HEAD */
 	if (rcsnum_cmp(frev, file->rf_head, 0) == -1)
 		frev = file->rf_head;
 
@@ -316,21 +314,21 @@ checkout_rev(RCSFILE *file, RCSNUM *frev, const char *dst, int flags,
  * Returns 0 on success, -1 on checkout_rev failure.
  */
 static int
-checkout_state(RCSFILE *rfp, RCSNUM *rev, const char *dst, int flags,
+checkout_state(RCSFILE *file, RCSNUM *rev, const char *dst, int flags,
     const char *username, const char *state)
 {
 	const char *tstate;
 	
 	if (rev == NULL) {
 		cvs_log(LP_ERR, "%s: No revision on branch has state %s",
-		    rfp->rf_path, state);
+		    file->rf_path, state);
 		return (-1);
 	} else {
-		if (((tstate = rcs_state_get(rfp, rev)) != NULL)
+		if (((tstate = rcs_state_get(file, rev)) != NULL)
 		    && (strcmp(state, tstate) == 0))
-			return (checkout_rev(rfp, rev, dst, flags, username));
+			return (checkout_rev(file, rev, dst, flags, username));
 		else
 			rev = rcsnum_dec(rev);
-		return (checkout_state(rfp, rev, dst, flags, username, state));
+		return (checkout_state(file, rev, dst, flags, username, state));
 	}
 }
diff --git a/usr.bin/rcs/rcsdiff.c b/usr.bin/rcs/rcsdiff.c
index 34fe87098b3..ad8bc7798f7 100644
--- a/usr.bin/rcs/rcsdiff.c
+++ b/usr.bin/rcs/rcsdiff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsdiff.c,v 1.22 2005/11/28 14:43:59 xsa Exp $	*/
+/*	$OpenBSD: rcsdiff.c,v 1.23 2005/11/29 11:11:39 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -173,7 +173,7 @@ rcsdiff_usage(void)
 }
 
 static int
-rcsdiff_file(RCSFILE *rfp, RCSNUM *rev, const char *filename)
+rcsdiff_file(RCSFILE *file, RCSNUM *rev, const char *filename)
 {
 	char path1[MAXPATHLEN], path2[MAXPATHLEN];
 	BUF *b1, *b2;
@@ -191,7 +191,7 @@ rcsdiff_file(RCSFILE *rfp, RCSNUM *rev, const char *filename)
 		fprintf(stderr, "%s -r%s %s\n", diffargs, rbuf, filename);
 	}
 
-	if ((b1 = rcs_getrev(rfp, rev)) == NULL) {
+	if ((b1 = rcs_getrev(file, rev)) == NULL) {
 		cvs_log(LP_ERR, "failed to retrieve revision");
 		return (-1);
 	}
@@ -229,7 +229,7 @@ rcsdiff_file(RCSFILE *rfp, RCSNUM *rev, const char *filename)
 }
 
 static int
-rcsdiff_rev(RCSFILE *rfp, RCSNUM *rev1, RCSNUM *rev2, const char *filename)
+rcsdiff_rev(RCSFILE *file, RCSNUM *rev1, RCSNUM *rev2, const char *filename)
 {
 	char path1[MAXPATHLEN], path2[MAXPATHLEN];
 	BUF *b1, *b2;
@@ -239,7 +239,7 @@ rcsdiff_rev(RCSFILE *rfp, RCSNUM *rev1, RCSNUM *rev2, const char *filename)
 	if (verbose == 1)
 		printf("retrieving revision %s\n", rbuf1);
 
-	if ((b1 = rcs_getrev(rfp, rev1)) == NULL) {
+	if ((b1 = rcs_getrev(file, rev1)) == NULL) {
 		cvs_log(LP_ERR, "failed to retrieve revision");
 		return (-1);
 	}
@@ -248,7 +248,7 @@ rcsdiff_rev(RCSFILE *rfp, RCSNUM *rev1, RCSNUM *rev2, const char *filename)
 	if (verbose == 1)
 		fprintf(stderr, "retrieving revision %s\n", rbuf2);
 
-	if ((b2 = rcs_getrev(rfp, rev2)) == NULL) {
+	if ((b2 = rcs_getrev(file, rev2)) == NULL) {
 		cvs_log(LP_ERR, "failed to retrieve revision");
 		return (-1);
 	}