spacing

8 files changed, 22 insertions, 23 deletions

diff --git a/usr.bin/cvs/add.c b/usr.bin/cvs/add.c
index bcf73266f72..047ceca978b 100644
--- a/usr.bin/cvs/add.c
+++ b/usr.bin/cvs/add.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: add.c,v 1.94 2008/02/09 20:04:00 xsa Exp $	*/
+/*	$OpenBSD: add.c,v 1.95 2008/03/01 21:29:36 deraadt Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
@@ -431,7 +431,6 @@ add_entry(struct cvs_file *cf)
 			(void)xsnprintf(tbuf, sizeof(tbuf), "Initial %s",
 			    cf->file_name);
 
-		
 		cvs_ent_line_str(cf->file_name, "0", tbuf, kflag ? kbuf : "",
 		    sticky, 0, 0, entry, CVS_ENT_MAXLINELEN);
 	}
diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h
index 363d451b692..261ff058162 100644
--- a/usr.bin/cvs/cvs.h
+++ b/usr.bin/cvs/cvs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cvs.h,v 1.161 2008/02/10 14:08:52 xsa Exp $	*/
+/*	$OpenBSD: cvs.h,v 1.162 2008/03/01 21:29:36 deraadt Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -375,9 +375,9 @@ time_t		 cvs_date_parse(const char *);
 struct cvs_ent	*cvs_ent_parse(const char *);
 struct cvs_ent	*cvs_ent_get(CVSENTRIES *, const char *);
 CVSENTRIES	*cvs_ent_open(const char *);
-void	 	cvs_ent_add(CVSENTRIES *, const char *);
-void	 	cvs_ent_remove(CVSENTRIES *, const char *);
-void	 	cvs_ent_close(CVSENTRIES *, int);
+void		cvs_ent_add(CVSENTRIES *, const char *);
+void		cvs_ent_remove(CVSENTRIES *, const char *);
+void		cvs_ent_close(CVSENTRIES *, int);
 void		cvs_ent_free(struct cvs_ent *);
 void		cvs_ent_line_str(const char *, char *, char *, char *, char *,
 		    int, int, char *, size_t);
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c
index 7e8b2b54846..6d6eea4d087 100644
--- a/usr.bin/cvs/diff.c
+++ b/usr.bin/cvs/diff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff.c,v 1.131 2008/02/27 22:34:04 joris Exp $	*/
+/*	$OpenBSD: diff.c,v 1.132 2008/03/01 21:29:36 deraadt Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  *
@@ -86,7 +86,7 @@ cvs_diff(int argc, char **argv)
 		case 'k':
 			koptstr = optarg;
 			kflag = rcs_kflag_get(koptstr);
-			if (RCS_KWEXP_INVAL(kflag)) {   
+			if (RCS_KWEXP_INVAL(kflag)) {
 				cvs_log(LP_ERR,
 				    "invalid RCS keyword expension mode");
 				fatal("%s", cvs_cmd_add.cmd_synopsis);
@@ -269,7 +269,7 @@ cvs_diff_local(struct cvs_file *cf)
 				    rev1, cf->file_path);
 				return;
 			}
- 			if (force_head) {
+			if (force_head) {
 				/* -f is not allowed for unknown symbols */
 				diff_rev1 = rcsnum_parse(rev1);
 				if (diff_rev1 == NULL)
@@ -290,7 +290,7 @@ cvs_diff_local(struct cvs_file *cf)
 				    rev2, cf->file_path);
 				return;
 			}
- 			if (force_head) {
+			if (force_head) {
 				/* -f is not allowed for unknown symbols */
 				diff_rev2 = rcsnum_parse(rev2);
 				if (diff_rev2 == NULL)
diff --git a/usr.bin/cvs/edit.c b/usr.bin/cvs/edit.c
index e2e011f17a2..c8faef21e6d 100644
--- a/usr.bin/cvs/edit.c
+++ b/usr.bin/cvs/edit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: edit.c,v 1.44 2008/02/06 12:42:46 tobias Exp $	*/
+/*	$OpenBSD: edit.c,v 1.45 2008/03/01 21:29:36 deraadt Exp $	*/
 /*
  * Copyright (c) 2006, 2007 Xavier Santolaria <xsa@openbsd.org>
  *
@@ -451,7 +451,7 @@ cvs_base_handle(struct cvs_file *cf, int flags)
 	}
 
 	if (fp != NULL) {
-		while(fgets(buf, sizeof(buf), fp)) {
+		while (fgets(buf, sizeof(buf), fp)) {
 			buf[strcspn(buf, "\n")] = '\0';
 
 			if (buf[0] != 'B')
diff --git a/usr.bin/cvs/entries.c b/usr.bin/cvs/entries.c
index 3b04b6e05e9..331c0cbe885 100644
--- a/usr.bin/cvs/entries.c
+++ b/usr.bin/cvs/entries.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: entries.c,v 1.94 2008/02/10 14:08:52 xsa Exp $	*/
+/*	$OpenBSD: entries.c,v 1.95 2008/03/01 21:29:36 deraadt Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  *
@@ -187,7 +187,7 @@ cvs_ent_parse(const char *entry)
 		ent->ce_opts = NULL;
 
 	if (strcmp(fields[5], "")) {
-		switch(*fields[5]) {
+		switch (*fields[5]) {
 		case 'D':
 			if (sscanf(fields[5] + 1, "%d.%d.%d.%d.%d.%d",
 			    &dt.tm_year, &dt.tm_mon, &dt.tm_mday,
diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c
index e39565f94b3..899da1b8d09 100644
--- a/usr.bin/cvs/file.c
+++ b/usr.bin/cvs/file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.c,v 1.225 2008/03/01 14:55:03 joris Exp $	*/
+/*	$OpenBSD: file.c,v 1.226 2008/03/01 21:29:37 deraadt Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
@@ -321,7 +321,7 @@ cvs_file_walklist(struct cvs_flisthead *fl, struct cvs_recursion *cr)
 					(void)close(fd);
 					goto next;
 				}
-			
+
 				/* this file is not in our working copy yet */
 				(void)close(fd);
 				fd = -1;
@@ -969,7 +969,7 @@ cvs_file_cmp(const char *file1, const char *file2)
 		if (stb1.st_size > (off_t)SIZE_MAX) {
 			ret = 1;
 			goto out;
-		}	
+		}
 
 		if ((p1 = mmap(NULL, stb1.st_size, PROT_READ,
 		    MAP_FILE, fd1, (off_t)0)) == MAP_FAILED)
@@ -1026,7 +1026,7 @@ cvs_file_copy(const char *from, const char *to)
 		if (st.st_size > (off_t)SIZE_MAX) {
 			ret = -1;
 			goto out;
-		}	
+		}
 
 		if ((dst = open(to, O_CREAT|O_TRUNC|O_WRONLY,
 		    st.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO))) == -1)
diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c
index afe2e176e7f..91af88565aa 100644
--- a/usr.bin/cvs/rcs.c
+++ b/usr.bin/cvs/rcs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcs.c,v 1.254 2008/03/01 20:03:56 joris Exp $	*/
+/*	$OpenBSD: rcs.c,v 1.255 2008/03/01 21:29:37 deraadt Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -2999,7 +2999,7 @@ rcs_rev_getbuf(RCSFILE *rfp, RCSNUM *rev, int mode)
 		}
 	}
 
-	for(lp = TAILQ_FIRST(&lines->l_lines); lp != NULL;) {
+	for (lp = TAILQ_FIRST(&lines->l_lines); lp != NULL;) {
 		nlp = TAILQ_NEXT(lp, l_list);
 
 		if (lp->l_line == NULL) {
@@ -3051,7 +3051,7 @@ rcs_rev_write_fd(RCSFILE *rfp, RCSNUM *rev, int fd, int mode)
 		}
 	}
 
-	for(lp = TAILQ_FIRST(&lines->l_lines); lp != NULL;) {
+	for (lp = TAILQ_FIRST(&lines->l_lines); lp != NULL;) {
 		nlp = TAILQ_NEXT(lp, l_list);
 
 		if (lp->l_line == NULL) {
diff --git a/usr.bin/cvs/tag.c b/usr.bin/cvs/tag.c
index b000876ee9d..6db487fa5ce 100644
--- a/usr.bin/cvs/tag.c
+++ b/usr.bin/cvs/tag.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tag.c,v 1.68 2008/03/01 20:03:56 joris Exp $	*/
+/*	$OpenBSD: tag.c,v 1.69 2008/03/01 21:29:37 deraadt Exp $	*/
 /*
  * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
  *
@@ -234,7 +234,7 @@ cvs_tag_local(struct cvs_file *cf)
 		return;
 	}
 
-	switch(cf->file_status) {
+	switch (cf->file_status) {
 	case FILE_ADDED:
 		if (verbosity > 1) {
 			cvs_log(LP_NOTICE,