summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorNiall O'Higgins <niallo@cvs.openbsd.org>2005-10-08 14:18:36 +0000
committerNiall O'Higgins <niallo@cvs.openbsd.org>2005-10-08 14:18:36 +0000
commitadb3235d127353f0dc1845ebda0f06566838aab4 (patch)
tree64a72404f3e22054f0386a34e198ad98dd111663 /usr.bin
parentbcc2360eef67b7acc53b508c8817b370321637e2 (diff)
KNF;
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/rcs/ci.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c
index dc9a8620d73..034e35f71a3 100644
--- a/usr.bin/rcs/ci.c
+++ b/usr.bin/rcs/ci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ci.c,v 1.6 2005/10/08 14:09:18 niallo Exp $ */
+/* $OpenBSD: ci.c,v 1.7 2005/10/08 14:18:35 niallo Exp $ */
/*
* Copyright (c) 2005 Niall O'Higgins <niallo@openbsd.org>
* All rights reserved.
@@ -136,12 +136,10 @@ checkin_main(int argc, char **argv)
exit(1);
}
-
if (dflag) {
/* XXX */
}
-
/*
* Load file contents
*/
@@ -183,7 +181,8 @@ checkin_main(int argc, char **argv)
* Current head revision gets the RCS patch as rd_text
*/
if (rcs_deltatext_set(file, file->rf_head, deltatext) == -1) {
- cvs_log(LP_ERR, "failed to set new rd_text for head rev");
+ cvs_log(LP_ERR,
+ "failed to set new rd_text for head rev");
exit (1);
}
/*
@@ -286,6 +285,7 @@ checkin_getlogmsg(char *rcsfile, char *workingfile, RCSNUM *rev)
BUF *logbuf;
RCSNUM *tmprev;
+ rcs_msg = NULL;
tmprev = rcsnum_alloc();
rcsnum_cpy(rev, tmprev, 16);
rcsnum_tostr(rev, prev, sizeof(prev));
@@ -293,13 +293,11 @@ checkin_getlogmsg(char *rcsfile, char *workingfile, RCSNUM *rev)
rcsnum_free(tmprev);
if ((logbuf = cvs_buf_alloc(64, BUF_AUTOEXT)) == NULL) {
- cvs_log(LP_ERR,
- "failed to allocate log buffer");
+ cvs_log(LP_ERR, "failed to allocate log buffer");
return (NULL);
}
cvs_printf("%s <-- %s\n", rcsfile, workingfile);
- cvs_printf("new revision: %s; previous revision: %s\n",
- nrev, prev);
+ cvs_printf("new revision: %s; previous revision: %s\n", nrev, prev);
cvs_printf("enter log message, terminated with single "
"'.' or end of file:\n");
cvs_printf(">> ");