summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorJoris Vink <joris@cvs.openbsd.org>2005-10-09 17:51:34 +0000
committerJoris Vink <joris@cvs.openbsd.org>2005-10-09 17:51:34 +0000
commit178eb4c48e29e0881b529ef4bd1b088205b5481f (patch)
tree6d62fe9358aa05ee53def6c12753dbf7705cedde /usr.bin
parent7d8eb7410755ef6008e8be3e187806d69b69c2da (diff)
simplify if() conditions;
ok niallo@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/rcs/ci.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c
index 39ab8b1a1ef..805f641a9d6 100644
--- a/usr.bin/rcs/ci.c
+++ b/usr.bin/rcs/ci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ci.c,v 1.12 2005/10/09 14:48:13 niallo Exp $ */
+/* $OpenBSD: ci.c,v 1.13 2005/10/09 17:51:33 joris Exp $ */
/*
* Copyright (c) 2005 Niall O'Higgins <niallo@openbsd.org>
* All rights reserved.
@@ -165,15 +165,13 @@ checkin_main(int argc, char **argv)
* assume HEAD.
*/
frev = file->rf_head;
+
/*
* If no log message specified, get it interactively.
*/
- if (rcs_msg == NULL && newrev == NULL)
- rcs_msg = checkin_getlogmsg(fpath, argv[i], frev, NULL);
- else if (rcs_msg == NULL && newrev != NULL)
+ if (rcs_msg != NULL)
rcs_msg = checkin_getlogmsg(fpath, argv[i], frev, newrev);
-
/*
* Remove the lock
*/