zap more unused variables.

5 files changed, 9 insertions, 31 deletions

diff --git a/usr.bin/cvs/admin.c b/usr.bin/cvs/admin.c
index a30a61bbd42..1c88aa96ad8 100644
--- a/usr.bin/cvs/admin.c
+++ b/usr.bin/cvs/admin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: admin.c,v 1.29 2006/02/01 08:33:18 xsa Exp $	*/
+/*	$OpenBSD: admin.c,v 1.30 2006/03/16 09:06:19 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
@@ -296,11 +296,10 @@ cvs_admin_pre_exec(struct cvsroot *root)
 static int
 cvs_admin_remote(CVSFILE *cf, void *arg)
 {
-	char *repo, fpath[MAXPATHLEN];
+	char fpath[MAXPATHLEN];
 	struct cvsroot *root;
 
 	root = CVS_DIR_ROOT(cf);
-	repo = CVS_DIR_REPO(cf);
 
 	if (cf->cf_type == DT_DIR) {
 		if (cf->cf_cvstat == CVS_FST_UNKNOWN)
diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c
index 39aa5b4dea0..e1a8970fe69 100644
--- a/usr.bin/cvs/commit.c
+++ b/usr.bin/cvs/commit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: commit.c,v 1.51 2006/01/02 08:11:56 xsa Exp $	*/
+/*	$OpenBSD: commit.c,v 1.52 2006/03/16 09:06:19 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -221,13 +221,9 @@ cvs_commit_prepare(CVSFILE *cf, void *arg)
 int
 cvs_commit_remote(CVSFILE *cf, void *arg)
 {
-	int ret;
 	char *repo, fpath[MAXPATHLEN];
-	RCSFILE *rf;
 	struct cvsroot *root;
 
-	ret = 0;
-	rf = NULL;
 	repo = NULL;
 	root = CVS_DIR_ROOT(cf);
 
diff --git a/usr.bin/cvs/edit.c b/usr.bin/cvs/edit.c
index 06d454595f4..23d78757e7d 100644
--- a/usr.bin/cvs/edit.c
+++ b/usr.bin/cvs/edit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: edit.c,v 1.11 2006/01/02 08:11:56 xsa Exp $	*/
+/*	$OpenBSD: edit.c,v 1.12 2006/03/16 09:06:19 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -96,10 +96,7 @@ struct cvs_cmd cvs_cmd_unedit = {
 static int
 cvs_edit_init(struct cvs_cmd *cmd, int argc, char **argv, int *arg)
 {
-	int ch, dflag, mod_count;
-
-	dflag = 0;
-	mod_count = 0;
+	int ch;
 
 	while ((ch = getopt(argc, argv, cmd->cmd_opts)) != -1) {
 		switch (ch) {
@@ -134,10 +131,6 @@ cvs_edit_init(struct cvs_cmd *cmd, int argc, char **argv, int *arg)
 static int
 cvs_edit_remote(CVSFILE *cf, void *arg)
 {
-	int *mod_count;
-
-	mod_count = (int *)arg;
-
 	return (CVS_EX_OK);
 }
 
@@ -149,10 +142,6 @@ cvs_edit_remote(CVSFILE *cf, void *arg)
 static int
 cvs_edit_local(CVSFILE *cf, void *arg)
 {
-	int *mod_count;
-
-	mod_count = (int *)arg;
-
 	return (CVS_EX_OK);
 }
 
diff --git a/usr.bin/cvs/remove.c b/usr.bin/cvs/remove.c
index 2619dceaba1..c3a9fa5f16d 100644
--- a/usr.bin/cvs/remove.c
+++ b/usr.bin/cvs/remove.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: remove.c,v 1.42 2006/01/27 12:45:21 xsa Exp $	*/
+/*	$OpenBSD: remove.c,v 1.43 2006/03/16 09:06:19 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * Copyright (c) 2004, 2005 Xavier Santolaria <xsa@openbsd.org>
@@ -92,11 +92,9 @@ cvs_remove_init(struct cvs_cmd *cmd, int argc, char **argv, int *arg)
 static int
 cvs_remove_remote(CVSFILE *cf, void *arg)
 {
-	int ret;
 	char fpath[MAXPATHLEN];
 	struct cvsroot *root;
 
-	ret = 0;
 	root = CVS_DIR_ROOT(cf);
 
 	if (cf->cf_type == DT_DIR) {
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c
index 5f2946f9905..13c2ebf0f99 100644
--- a/usr.bin/cvs/update.c
+++ b/usr.bin/cvs/update.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: update.c,v 1.55 2006/03/14 15:59:06 xsa Exp $	*/
+/*	$OpenBSD: update.c,v 1.56 2006/03/16 09:06:19 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -203,21 +203,17 @@ cvs_update_remote(CVSFILE *cf, void *arg)
 static int
 cvs_update_local(CVSFILE *cf, void *arg)
 {
-	int ret, islocal, revdiff;
+	int islocal, revdiff;
 	char fpath[MAXPATHLEN], rcspath[MAXPATHLEN];
-	char *repo;
 	RCSFILE *rf;
 	RCSNUM *frev;
 	BUF *fbuf;
-	struct cvsroot *root;
 
-	revdiff = ret = 0;
+	revdiff = 0;
 	rf = NULL;
 	frev = NULL;
 	islocal = (cvs_cmdop != CVS_OP_SERVER);
 
-	root = CVS_DIR_ROOT(cf);
-	repo = CVS_DIR_REPO(cf);
 	cvs_file_getpath(cf, fpath, sizeof(fpath));
 
 	if (cf->cf_cvstat == CVS_FST_UNKNOWN) {