summaryrefslogtreecommitdiff
path: root/usr.bin/rcs/rcsprog.c
diff options
context:
space:
mode:
authorXavier Santolaria <xsa@cvs.openbsd.org>2006-04-10 08:08:01 +0000
committerXavier Santolaria <xsa@cvs.openbsd.org>2006-04-10 08:08:01 +0000
commit6931a528d08a8c9f0cb64dc3dd4f8a2492de405b (patch)
tree33826c452f4d1e1fa9123732d37e88a3a0baab59 /usr.bin/rcs/rcsprog.c
parent5f66dcea266683bbff00705f64acceee5113f98c (diff)
change rcs_kwexp_set() return type to void and simplify its use. OK niallo@.
Diffstat (limited to 'usr.bin/rcs/rcsprog.c')
-rw-r--r--usr.bin/rcs/rcsprog.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/rcs/rcsprog.c b/usr.bin/rcs/rcsprog.c
index 245fc38ecc2..a421be6ecc3 100644
--- a/usr.bin/rcs/rcsprog.c
+++ b/usr.bin/rcs/rcsprog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcsprog.c,v 1.94 2006/04/07 12:54:40 xsa Exp $ */
+/* $OpenBSD: rcsprog.c,v 1.95 2006/04/10 08:08:00 xsa Exp $ */
/*
* Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -440,7 +440,8 @@ rcs_main(int argc, char **argv)
struct rcs_access *acp;
time_t rcs_mtime = -1;
- kflag = lkmode = -1;
+ kflag = RCS_KWEXP_ERR;
+ lkmode = -1;
fmode = S_IRUSR|S_IRGRP|S_IROTH;
flags = RCS_RDWR|RCS_PARSE_FULLY;
lrev = urev = descfile = nflag = NULL;
@@ -646,8 +647,7 @@ rcs_main(int argc, char **argv)
file->rf_flags &= ~RCS_SYNCED;
}
- if (kflag != -1)
- rcs_kwexp_set(file, kflag);
+ rcs_kwexp_set(file, kflag);
if (lkmode != -1)
(void)rcs_lock_setmode(file, lkmode);