KNF;

13 files changed, 72 insertions, 72 deletions

diff --git a/usr.bin/cvs/log.c b/usr.bin/cvs/log.c
index 8979d44d86d..5912825a6f2 100644
--- a/usr.bin/cvs/log.c
+++ b/usr.bin/cvs/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.21 2005/07/07 14:27:57 joris Exp $	*/
+/*	$OpenBSD: log.c,v 1.22 2005/07/25 12:13:08 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -72,10 +72,10 @@ static u_int cvs_log_flags = 0;
 static struct syslog_data cvs_sl = SYSLOG_DATA_INIT;
 
 /* filter manipulation macros */
-#define CVS_LOG_FLTRRST()    (cvs_log_filters = 0)
-#define CVS_LOG_FLTRSET(l)   (cvs_log_filters |= (1 << l))
-#define CVS_LOG_FLTRGET(l)   (cvs_log_filters & (1 << l))
-#define CVS_LOG_FLTRCLR(l)   (cvs_log_filters &= ~(1 << l))
+#define CVS_LOG_FLTRRST()	(cvs_log_filters = 0)
+#define CVS_LOG_FLTRSET(l)	(cvs_log_filters |= (1 << l))
+#define CVS_LOG_FLTRGET(l)	(cvs_log_filters & (1 << l))
+#define CVS_LOG_FLTRCLR(l)	(cvs_log_filters &= ~(1 << l))
 
 static u_int cvs_log_filters;
 
diff --git a/usr.bin/cvs/logmsg.c b/usr.bin/cvs/logmsg.c
index 051e734f81c..63aa2b60e6a 100644
--- a/usr.bin/cvs/logmsg.c
+++ b/usr.bin/cvs/logmsg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: logmsg.c,v 1.17 2005/07/25 12:05:43 xsa Exp $	*/
+/*	$OpenBSD: logmsg.c,v 1.18 2005/07/25 12:13:08 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -39,9 +39,9 @@
 #include "proto.h"
 
 
-#define CVS_LOGMSG_BIGMSG     32000
-#define CVS_LOGMSG_FTMPL      "/tmp/cvsXXXXXXXXXX"
-#define CVS_LOGMSG_PREFIX     "CVS:"
+#define CVS_LOGMSG_BIGMSG	32000
+#define CVS_LOGMSG_FTMPL	"/tmp/cvsXXXXXXXXXX"
+#define CVS_LOGMSG_PREFIX	"CVS:"
 #define CVS_LOGMSG_LINE \
 "----------------------------------------------------------------------"
 
diff --git a/usr.bin/cvs/proto.c b/usr.bin/cvs/proto.c
index a6b537f9994..50993a4a960 100644
--- a/usr.bin/cvs/proto.c
+++ b/usr.bin/cvs/proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proto.c,v 1.67 2005/07/25 12:05:43 xsa Exp $	*/
+/*	$OpenBSD: proto.c,v 1.68 2005/07/25 12:13:08 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -58,10 +58,10 @@
 
 
 /* request flags */
-#define CVS_REQF_RESP    0x01
+#define CVS_REQF_RESP	0x01
 
 
-static int  cvs_initlog   (void);
+static int	cvs_initlog(void);
 
 struct cvs_req cvs_requests[] = {
 	{ CVS_REQ_DIRECTORY,     "Directory",         0             },
@@ -146,8 +146,8 @@ struct cvs_resp cvs_responses[] = {
 	{ CVS_RESP_COPYFILE,   "Copy-file"              },
 };
 
-#define CVS_NBREQ   (sizeof(cvs_requests)/sizeof(cvs_requests[0]))
-#define CVS_NBRESP  (sizeof(cvs_responses)/sizeof(cvs_responses[0]))
+#define CVS_NBREQ	(sizeof(cvs_requests)/sizeof(cvs_requests[0]))
+#define CVS_NBRESP	(sizeof(cvs_responses)/sizeof(cvs_responses[0]))
 
 /* hack to receive the remote version without outputting it */
 u_int cvs_version_sent = 0;
diff --git a/usr.bin/cvs/rcsnum.c b/usr.bin/cvs/rcsnum.c
index 985120a0333..d8dd97d233a 100644
--- a/usr.bin/cvs/rcsnum.c
+++ b/usr.bin/cvs/rcsnum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsnum.c,v 1.13 2005/07/25 12:05:43 xsa Exp $	*/
+/*	$OpenBSD: rcsnum.c,v 1.14 2005/07/25 12:13:08 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -35,7 +35,7 @@
 #include "rcs.h"
 
 
-static int rcsnum_setsize  (RCSNUM *, u_int);
+static int	rcsnum_setsize(RCSNUM *, u_int);
 
 
 /*
@@ -44,7 +44,7 @@ static int rcsnum_setsize  (RCSNUM *, u_int);
  * Allocate an RCS number structure and return a pointer to it on success,
  * or NULL on failure.
  */
-RCSNUM*
+RCSNUM *
 rcsnum_alloc(void)
 {
 	RCSNUM *rnp;
@@ -65,7 +65,7 @@ rcsnum_alloc(void)
  *
  * Parse a string specifying an RCS number and return the corresponding RCSNUM.
  */
-RCSNUM*
+RCSNUM *
 rcsnum_parse(const char *str)
 {
 	char *ep;
@@ -267,7 +267,7 @@ rcsnum_aton_failed:
  * Increment the revision number specified in <num>.
  * Returns a pointer to the <num> on success, or NULL on failure.
  */
-RCSNUM*
+RCSNUM *
 rcsnum_inc(RCSNUM *num)
 {
 	if (num->rn_id[num->rn_len - 1] == RCSNUM_MAXNUM)
@@ -283,7 +283,7 @@ rcsnum_inc(RCSNUM *num)
  * If <num> is a branch revision, the returned value will be the same
  * number as the argument.
  */
-RCSNUM*
+RCSNUM *
 rcsnum_revtobr(const RCSNUM *num)
 {
 	RCSNUM *brnum;
@@ -308,7 +308,7 @@ rcsnum_revtobr(const RCSNUM *num)
  * Retrieve the initial revision number associated with the branch number <num>.
  * If <num> is a revision number, an error will be returned.
  */
-RCSNUM*
+RCSNUM *
 rcsnum_brtorev(const RCSNUM *brnum)
 {
 	RCSNUM *num;
diff --git a/usr.bin/cvs/release.c b/usr.bin/cvs/release.c
index 5a3bc2e085f..131cf35029a 100644
--- a/usr.bin/cvs/release.c
+++ b/usr.bin/cvs/release.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: release.c,v 1.17 2005/07/23 10:59:47 xsa Exp $	*/
+/*	$OpenBSD: release.c,v 1.18 2005/07/25 12:13:08 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
  * All rights reserved.
@@ -42,10 +42,10 @@
 
 extern char *__progname;
 
-static int cvs_release_init     (struct cvs_cmd *, int, char **, int *);
-static int cvs_release_pre_exec (struct cvsroot *);
-static int cvs_release_yesno    (void);
-static int cvs_release_dir      (CVSFILE *, void *);
+static int	cvs_release_init(struct cvs_cmd *, int, char **, int *);
+static int	cvs_release_pre_exec(struct cvsroot *);
+static int	cvs_release_yesno(void);
+static int	cvs_release_dir(CVSFILE *, void *);
 
 struct cvs_cmd cvs_cmd_release = {
 	CVS_OP_RELEASE, CVS_REQ_RELEASE, "release",
diff --git a/usr.bin/cvs/remove.c b/usr.bin/cvs/remove.c
index 42d1c0c3850..bdf3b1dfc45 100644
--- a/usr.bin/cvs/remove.c
+++ b/usr.bin/cvs/remove.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: remove.c,v 1.25 2005/07/24 17:48:05 xsa Exp $	*/
+/*	$OpenBSD: remove.c,v 1.26 2005/07/25 12:13:08 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * Copyright (c) 2004, 2005 Xavier Santolaria <xsa@openbsd.org>
@@ -42,10 +42,10 @@
 extern char *__progname;
 
 
-static int cvs_remove_init   (struct cvs_cmd *, int, char **, int *);
-static int cvs_remove_remote (CVSFILE *, void *);
-static int cvs_remove_local  (CVSFILE *, void *);
-static int cvs_remove_file   (const char *);
+static int	cvs_remove_init(struct cvs_cmd *, int, char **, int *);
+static int	cvs_remove_remote(CVSFILE *, void *);
+static int	cvs_remove_local(CVSFILE *, void *);
+static int	cvs_remove_file(const char *);
 
 static int	force_remove = 0;	/* -f option */
 static int	nuked = 0;
diff --git a/usr.bin/cvs/repo.c b/usr.bin/cvs/repo.c
index 387639d38e4..118f9f45a0e 100644
--- a/usr.bin/cvs/repo.c
+++ b/usr.bin/cvs/repo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: repo.c,v 1.6 2005/07/25 12:05:43 xsa Exp $	*/
+/*	$OpenBSD: repo.c,v 1.7 2005/07/25 12:13:08 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -43,7 +43,7 @@
 
 
 
-static CVSRPENT*  cvs_repo_loadrec (CVSREPO *, const char *);
+static CVSRPENT	*cvs_repo_loadrec(CVSREPO *, const char *);
 
 
 /*
@@ -53,7 +53,7 @@ static CVSRPENT*  cvs_repo_loadrec (CVSREPO *, const char *);
  * is specified in <base>.
  */
 
-CVSREPO*
+CVSREPO *
 cvs_repo_load(const char *base, int flags)
 {
 	struct stat st;
diff --git a/usr.bin/cvs/req.c b/usr.bin/cvs/req.c
index 6fa2098b74e..25516171b8c 100644
--- a/usr.bin/cvs/req.c
+++ b/usr.bin/cvs/req.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: req.c,v 1.28 2005/07/23 10:59:47 xsa Exp $	*/
+/*	$OpenBSD: req.c,v 1.29 2005/07/25 12:13:08 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -50,22 +50,22 @@ extern int   cvs_nolog;
 extern int   cvs_readonly;
 
 
-static int  cvs_req_set          (int, char *);
-static int  cvs_req_noop         (int, char *);
-static int  cvs_req_root         (int, char *);
-static int  cvs_req_validreq     (int, char *);
-static int  cvs_req_validresp    (int, char *);
-static int  cvs_req_expandmod    (int, char *);
-static int  cvs_req_directory    (int, char *);
-static int  cvs_req_useunchanged (int, char *);
-static int  cvs_req_case         (int, char *);
-static int  cvs_req_argument     (int, char *);
-static int  cvs_req_globalopt    (int, char *);
-static int  cvs_req_gzipstream   (int, char *);
-static int  cvs_req_entry        (int, char *);
-static int  cvs_req_filestate    (int, char *);
-
-static int  cvs_req_command      (int, char *);
+static int	cvs_req_set(int, char *);
+static int	cvs_req_noop(int, char *);
+static int	cvs_req_root(int, char *);
+static int	cvs_req_validreq(int, char *);
+static int	cvs_req_validresp(int, char *);
+static int	cvs_req_expandmod(int, char *);
+static int	cvs_req_directory(int, char *);
+static int	cvs_req_useunchanged(int, char *);
+static int	cvs_req_case(int, char *);
+static int	cvs_req_argument(int, char *);
+static int	cvs_req_globalopt(int, char *);
+static int	cvs_req_gzipstream(int, char *);
+static int	cvs_req_entry(int, char *);
+static int	cvs_req_filestate(int, char *);
+
+static int	cvs_req_command(int, char *);
 
 
 struct cvs_reqhdlr {
diff --git a/usr.bin/cvs/root.c b/usr.bin/cvs/root.c
index 15426400c3c..9ebda0a9603 100644
--- a/usr.bin/cvs/root.c
+++ b/usr.bin/cvs/root.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: root.c,v 1.20 2005/07/25 12:05:43 xsa Exp $	*/
+/*	$OpenBSD: root.c,v 1.21 2005/07/25 12:13:08 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -81,7 +81,7 @@ static u_int cvs_rcsz = 0;
  * Returns a pointer to the allocated information on success, or NULL
  * on failure.
  */
-struct cvsroot*
+struct cvsroot *
 cvsroot_parse(const char *str)
 {
 	u_int i;
@@ -257,7 +257,7 @@ cvsroot_free(struct cvsroot *root)
  * 2) the CVS/Root file found in checked-out trees
  * 3) the CVSROOT environment variable
  */
-struct cvsroot*
+struct cvsroot *
 cvsroot_get(const char *dir)
 {
 	int l;
diff --git a/usr.bin/cvs/tag.c b/usr.bin/cvs/tag.c
index 17cb1091a42..721e833a341 100644
--- a/usr.bin/cvs/tag.c
+++ b/usr.bin/cvs/tag.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tag.c,v 1.27 2005/07/24 16:46:40 xsa Exp $	*/
+/*	$OpenBSD: tag.c,v 1.28 2005/07/25 12:13:08 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * Copyright (c) 2004 Joris Vink <joris@openbsd.org>
@@ -37,10 +37,10 @@
 #include "proto.h"
 
 
-static int cvs_tag_init     (struct cvs_cmd *, int, char **, int *);
-static int cvs_tag_local    (CVSFILE *, void *);
-static int cvs_tag_remote   (CVSFILE *, void *);
-static int cvs_tag_pre_exec (struct cvsroot *);
+static int	cvs_tag_init(struct cvs_cmd *, int, char **, int *);
+static int	cvs_tag_local(CVSFILE *, void *);
+static int	cvs_tag_remote(CVSFILE *, void *);
+static int	cvs_tag_pre_exec(struct cvsroot *);
 
 static char *tag_name = NULL;
 static char *tag_date = NULL;
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c
index 9fb6dd78b7e..bdcd6621fa7 100644
--- a/usr.bin/cvs/update.c
+++ b/usr.bin/cvs/update.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: update.c,v 1.41 2005/07/23 11:19:46 joris Exp $	*/
+/*	$OpenBSD: update.c,v 1.42 2005/07/25 12:13:08 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -38,10 +38,10 @@
 #include "proto.h"
 
 
-static int cvs_update_init     (struct cvs_cmd *, int, char **, int *);
-static int cvs_update_pre_exec (struct cvsroot *);
-static int cvs_update_remote    (CVSFILE *, void *);
-static int cvs_update_local     (CVSFILE *, void *);
+static int	cvs_update_init(struct cvs_cmd *, int, char **, int *);
+static int	cvs_update_pre_exec(struct cvsroot *);
+static int	cvs_update_remote(CVSFILE *, void *);
+static int	cvs_update_local(CVSFILE *, void *);
 
 
 struct cvs_cmd cvs_cmd_update = {
diff --git a/usr.bin/cvs/version.c b/usr.bin/cvs/version.c
index 389745dd02e..a93fd92c1c1 100644
--- a/usr.bin/cvs/version.c
+++ b/usr.bin/cvs/version.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: version.c,v 1.17 2005/06/02 20:15:03 joris Exp $	*/
+/*	$OpenBSD: version.c,v 1.18 2005/07/25 12:13:08 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -36,7 +36,7 @@
 #include "log.h"
 #include "proto.h"
 
-static int cvs_version_pre_exec (struct cvsroot *);
+static int	cvs_version_pre_exec(struct cvsroot *);
 
 struct cvs_cmd cvs_cmd_version = {
 	CVS_OP_VERSION, CVS_REQ_VERSION, "version",
diff --git a/usr.bin/cvs/watch.c b/usr.bin/cvs/watch.c
index f565e8fc012..c2adc97595b 100644
--- a/usr.bin/cvs/watch.c
+++ b/usr.bin/cvs/watch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: watch.c,v 1.4 2005/07/07 14:27:57 joris Exp $	*/
+/*	$OpenBSD: watch.c,v 1.5 2005/07/25 12:13:08 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
  * All rights reserved.
@@ -37,12 +37,12 @@
 #include "log.h"
 #include "proto.h"
 
-static int cvs_watch_init   (struct cvs_cmd *, int, char **, int *);
-static int cvs_watch_remote (CVSFILE *, void*);
-static int cvs_watch_local  (CVSFILE *, void*);
+static int	cvs_watch_init(struct cvs_cmd *, int, char **, int *);
+static int	cvs_watch_remote(CVSFILE *, void*);
+static int	cvs_watch_local(CVSFILE *, void*);
 
-static int cvs_watchers_remote (CVSFILE *, void*);
-static int cvs_watchers_local  (CVSFILE *, void*);
+static int	cvs_watchers_remote(CVSFILE *, void*);
+static int	cvs_watchers_local(CVSFILE *, void*);
 
 
 struct cvs_cmd cvs_cmd_watch = {