summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoris <joris@openbsd.org>2005-10-09 17:51:33 +0000
committerjoris <joris@openbsd.org>2005-10-09 17:51:33 +0000
commit520121d58d65d255ffe354657dc337bf09231173 (patch)
treed7848f70406ac376ea8a59427f1205decb01184a
parentspelling (diff)
downloadwireguard-openbsd-520121d58d65d255ffe354657dc337bf09231173.tar.xz
wireguard-openbsd-520121d58d65d255ffe354657dc337bf09231173.zip
simplify if() conditions;
ok niallo@
-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
*/