summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxsa <xsa@openbsd.org>2006-04-06 10:04:40 +0000
committerxsa <xsa@openbsd.org>2006-04-06 10:04:40 +0000
commit4db406c7a28778b06a336b7e1a638310fa00b7eb (patch)
tree9e065e4279ca4d02b5438a0ca5d9c3aedde48976
parentAdd limited support for -CC option. In particular, this does not work (diff)
downloadwireguard-openbsd-4db406c7a28778b06a336b7e1a638310fa00b7eb.tar.xz
wireguard-openbsd-4db406c7a28778b06a336b7e1a638310fa00b7eb.zip
small knf;
-rw-r--r--usr.bin/rcs/rlog.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/usr.bin/rcs/rlog.c b/usr.bin/rcs/rlog.c
index 4aadcfb94c0..d9419dd0b1e 100644
--- a/usr.bin/rcs/rlog.c
+++ b/usr.bin/rcs/rlog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rlog.c,v 1.36 2006/03/30 06:11:03 ray Exp $ */
+/* $OpenBSD: rlog.c,v 1.37 2006/04/06 10:04:40 xsa Exp $ */
/*
* Copyright (c) 2005 Joris Vink <joris@openbsd.org>
* Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
@@ -81,13 +81,13 @@ rlog_main(int argc, char **argv)
case 'q':
verbose = 0;
break;
+ case 'R':
+ Rflag = 1;
+ break;
case 'r':
rflag = 1;
revisions = rcs_optarg;
break;
- case 'R':
- Rflag = 1;
- break;
case 's':
slist = rcs_optarg;
break;
@@ -355,20 +355,18 @@ rlog_rev_select(void)
if (revrange->argv[0] == NULL)
/* should not happen */
fatal("invalid revision range: %s", revargv->argv[i]);
- else if (revrange->argv[1] == NULL) {
+ else if (revrange->argv[1] == NULL)
lstr = rstr = revrange->argv[0];
- } else {
+ else {
if (revrange->argv[2] != NULL)
fatal("invalid revision range: %s",
revargv->argv[i]);
lstr = revrange->argv[0];
rstr = revrange->argv[1];
- if (strcmp(lstr, "") == 0) {
+ if (strcmp(lstr, "") == 0)
lstr = NULL;
- }
- if (strcmp(rstr, "") == 0) {
+ if (strcmp(rstr, "") == 0)
rstr = NULL;
- }
}
if (lstr == NULL)
@@ -380,7 +378,8 @@ rlog_rev_select(void)
if (rcsnum_aton(rstr, &ep, &rnum) == 0 || (*ep != '\0'))
fatal("invalid revision: %s", rstr);
} else
- (void)rcsnum_cpy(file->rf_head, &rnum, 0);
+ rcsnum_cpy(file->rf_head, &rnum, 0);
+
cvs_argv_destroy(revrange);
TAILQ_FOREACH(rdp, &file->rf_delta, rd_list)