summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/cvs/admin.c5
-rw-r--r--usr.bin/cvs/annotate.c5
-rw-r--r--usr.bin/cvs/commit.c6
-rw-r--r--usr.bin/cvs/getlog.c5
-rw-r--r--usr.bin/cvs/status.c6
-rw-r--r--usr.bin/cvs/tag.c5
-rw-r--r--usr.bin/cvs/update.c6
7 files changed, 14 insertions, 24 deletions
diff --git a/usr.bin/cvs/admin.c b/usr.bin/cvs/admin.c
index 1bfc19974f5..389c62c7a1f 100644
--- a/usr.bin/cvs/admin.c
+++ b/usr.bin/cvs/admin.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: admin.c,v 1.23 2005/07/27 16:42:19 xsa Exp $ */
+/* $OpenBSD: admin.c,v 1.24 2005/12/22 14:59:54 xsa Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* Copyright (c) 2005 Joris Vink <joris@openbsd.org>
@@ -374,8 +374,7 @@ cvs_admin_local(CVSFILE *cf, void *arg)
cvs_file_getpath(cf, fpath, sizeof(fpath));
- if (cvs_rcs_getpath(cf, rcspath, sizeof(rcspath)) == NULL)
- return (CVS_EX_DATA);
+ cvs_rcs_getpath(cf, rcspath, sizeof(rcspath));
rf = rcs_open(rcspath, RCS_RDWR);
if (rf == NULL)
diff --git a/usr.bin/cvs/annotate.c b/usr.bin/cvs/annotate.c
index adb9bd86ecc..e1a3f964623 100644
--- a/usr.bin/cvs/annotate.c
+++ b/usr.bin/cvs/annotate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: annotate.c,v 1.23 2005/07/25 12:05:43 xsa Exp $ */
+/* $OpenBSD: annotate.c,v 1.24 2005/12/22 14:59:54 xsa Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -191,8 +191,7 @@ cvs_annotate_local(CVSFILE *cf, void *arg)
if (cf->cf_cvstat == CVS_FST_UNKNOWN)
return (0);
- if (cvs_rcs_getpath(cf, rcspath, sizeof(rcspath)) == NULL)
- return (CVS_EX_DATA);
+ cvs_rcs_getpath(cf, rcspath, sizeof(rcspath));
rf = rcs_open(rcspath, RCS_READ);
if (rf == NULL)
diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c
index cd5795753d6..b5aeb0b6da9 100644
--- a/usr.bin/cvs/commit.c
+++ b/usr.bin/cvs/commit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: commit.c,v 1.48 2005/12/21 20:06:25 xsa Exp $ */
+/* $OpenBSD: commit.c,v 1.49 2005/12/22 14:59:54 xsa Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -292,9 +292,7 @@ cvs_commit_local(CVSFILE *cf, void *arg)
}
cvs_file_getpath(cf, fpath, sizeof(fpath));
-
- if (cvs_rcs_getpath(cf, rcspath, sizeof(rcspath)) == NULL)
- return (CVS_EX_DATA);
+ cvs_rcs_getpath(cf, rcspath, sizeof(rcspath));
return (0);
}
diff --git a/usr.bin/cvs/getlog.c b/usr.bin/cvs/getlog.c
index 6e68596a9fd..208e7839b90 100644
--- a/usr.bin/cvs/getlog.c
+++ b/usr.bin/cvs/getlog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getlog.c,v 1.47 2005/11/03 15:57:40 xsa Exp $ */
+/* $OpenBSD: getlog.c,v 1.48 2005/12/22 14:59:54 xsa Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -228,8 +228,7 @@ cvs_getlog_local(CVSFILE *cf, void *arg)
return (0);
}
- if (cvs_rcs_getpath(cf, rcspath, sizeof(rcspath)) == NULL)
- return (CVS_EX_DATA);
+ cvs_rcs_getpath(cf, rcspath, sizeof(rcspath));
if (log_rfonly) {
cvs_printf("%s\n", rcspath);
diff --git a/usr.bin/cvs/status.c b/usr.bin/cvs/status.c
index 1f9f5c3b163..abbfde6406c 100644
--- a/usr.bin/cvs/status.c
+++ b/usr.bin/cvs/status.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: status.c,v 1.48 2005/09/22 16:13:44 xsa Exp $ */
+/* $OpenBSD: status.c,v 1.49 2005/12/22 14:59:54 xsa Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
@@ -188,9 +188,7 @@ cvs_status_local(CVSFILE *cf, void *arg)
}
cvs_file_getpath(cf, fpath, sizeof(fpath));
-
- if (cvs_rcs_getpath(cf, rcspath, sizeof(rcspath)) == NULL)
- return (CVS_EX_DATA);
+ cvs_rcs_getpath(cf, rcspath, sizeof(rcspath));
rf = NULL;
if (cf->cf_cvstat != CVS_FST_UNKNOWN &&
diff --git a/usr.bin/cvs/tag.c b/usr.bin/cvs/tag.c
index 77ec1e12c9f..ca46d7bddca 100644
--- a/usr.bin/cvs/tag.c
+++ b/usr.bin/cvs/tag.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tag.c,v 1.33 2005/09/27 16:33:35 xsa Exp $ */
+/* $OpenBSD: tag.c,v 1.34 2005/12/22 14:59:54 xsa Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* Copyright (c) 2004 Joris Vink <joris@openbsd.org>
@@ -278,8 +278,7 @@ cvs_tag_local(CVSFILE *cf, void *arg)
tag_rev = cf->cf_lrev;
- if (cvs_rcs_getpath(cf, rcspath, sizeof(rcspath)) == NULL)
- return (CVS_EX_DATA);
+ cvs_rcs_getpath(cf, rcspath, sizeof(rcspath));
rf = rcs_open(rcspath, RCS_READ|RCS_WRITE);
if (rf == NULL) {
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c
index 6dc5e140f40..b42cb9a7198 100644
--- a/usr.bin/cvs/update.c
+++ b/usr.bin/cvs/update.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: update.c,v 1.47 2005/12/03 15:31:53 joris Exp $ */
+/* $OpenBSD: update.c,v 1.48 2005/12/22 14:59:54 xsa Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -244,12 +244,10 @@ cvs_update_local(CVSFILE *cf, void *arg)
if (cf->cf_type == DT_DIR) {
if (verbosity > 1)
cvs_log(LP_NOTICE, "Updating %s", fpath);
-
return (CVS_EX_OK);
}
- if (cvs_rcs_getpath(cf, rcspath, sizeof(rcspath)) == NULL)
- return (CVS_EX_DATA);
+ cvs_rcs_getpath(cf, rcspath, sizeof(rcspath));
/*
* Only open the RCS file for files that have not been added.