From 6ffd281a697af661253912125302614235297fc3 Mon Sep 17 00:00:00 2001
From: Eirik Nygaard <eirikn@dragonflybsd.org>
Date: Sat, 22 Nov 2003 11:38:13 +0000
Subject: [PATCH]  * K&R function cleanup

---
 usr.sbin/mailwrapper/mailwrapper.c | 19 ++++----------
 usr.sbin/mld6query/mld6.c          |  4 +--
 usr.sbin/mrouted/callout.c         | 11 ++++----
 usr.sbin/mtree/compare.c           | 16 ++++--------
 usr.sbin/mtree/create.c            | 40 ++++++------------------------
 usr.sbin/mtree/misc.c              | 12 +++------
 usr.sbin/mtree/mtree.c             |  8 +++---
 usr.sbin/mtree/spec.c              | 12 +++------
 usr.sbin/mtree/verify.c            | 10 +++-----
 9 files changed, 40 insertions(+), 92 deletions(-)

diff --git a/usr.sbin/mailwrapper/mailwrapper.c b/usr.sbin/mailwrapper/mailwrapper.c
index 19f2229af4..312d72d1d5 100644
--- a/usr.sbin/mailwrapper/mailwrapper.c
+++ b/usr.sbin/mailwrapper/mailwrapper.c
@@ -1,7 +1,7 @@
 /*	$OpenBSD: mailwrapper.c,v 1.6 1999/12/17 05:06:28 mickey Exp $	*/
 /*	$NetBSD: mailwrapper.c,v 1.3 1999/05/29 18:18:15 christos Exp $	*/
 /* $FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.c,v 1.4.2.3 2001/10/01 12:52:47 dd Exp $ */
-/* $DragonFly: src/usr.sbin/mailwrapper/mailwrapper.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $ */
+/* $DragonFly: src/usr.sbin/mailwrapper/mailwrapper.c,v 1.4 2003/11/22 11:38:13 eirikn Exp $ */
 
 /*
  * Copyright (c) 1998
@@ -59,8 +59,7 @@ static void freearg(struct arglist *, int);
 extern const char *__progname;	/* from crt0.o */
 
 static void
-initarg(al)
-	struct arglist *al;
+initarg(struct arglist *al)
 {
 	al->argc = 0;
 	al->maxc = 10;
@@ -69,10 +68,7 @@ initarg(al)
 }
 
 static void
-addarg(al, arg, copy)
-	struct arglist *al;
-	const char *arg;
-	int copy;
+addarg(struct arglist *al, const char *arg, int copy)
 {
 	char **argv2;
 
@@ -97,9 +93,7 @@ addarg(al, arg, copy)
 }
 
 static void
-freearg(al, copy)
-	struct arglist *al;
-	int copy;
+freearg(struct arglist *al, int copy)
 {
 	size_t i;
 	if (copy)
@@ -109,10 +103,7 @@ freearg(al, copy)
 }
 
 int
-main(argc, argv, envp)
-	int argc;
-	char *argv[];
-	char *envp[];
+main(int argc, char **argv, char **envp)
 {
 	FILE *config;
 	char *line, *cp, *from, *to, *ap;
diff --git a/usr.sbin/mld6query/mld6.c b/usr.sbin/mld6query/mld6.c
index 2a16f30473..e071f9ee8c 100644
--- a/usr.sbin/mld6query/mld6.c
+++ b/usr.sbin/mld6query/mld6.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/mld6query/mld6.c,v 1.1.1.1.2.2 2001/07/03 11:02:06 ume Exp $
- * $DragonFly: src/usr.sbin/mld6query/mld6.c,v 1.2 2003/06/17 04:29:57 dillon Exp $
+ * $DragonFly: src/usr.sbin/mld6query/mld6.c,v 1.3 2003/11/22 11:38:13 eirikn Exp $
  */
 #include <sys/param.h>
 #include <sys/uio.h>
@@ -265,7 +265,7 @@ quit(int signum) {
 }
 
 void
-usage()
+usage(void)
 {
 	(void)fprintf(stderr, "usage: mld6query ifname [addr]\n");
 	exit(1);
diff --git a/usr.sbin/mrouted/callout.c b/usr.sbin/mrouted/callout.c
index 30c64ce1e2..c34e24a195 100644
--- a/usr.sbin/mrouted/callout.c
+++ b/usr.sbin/mrouted/callout.c
@@ -10,7 +10,7 @@
  * callout.c,v 3.8.4.8 1998/01/06 01:58:45 fenner Exp
  *
  * $FreeBSD: src/usr.sbin/mrouted/callout.c,v 1.12 1999/08/28 01:17:03 peter Exp $
- * $DragonFly: src/usr.sbin/mrouted/callout.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $
+ * $DragonFly: src/usr.sbin/mrouted/callout.c,v 1.4 2003/11/22 11:38:13 eirikn Exp $
  */
 
 #include "defs.h"
@@ -34,13 +34,13 @@ static void print_Q(void);
 #endif
 
 void
-callout_init()
+callout_init(void)
 {
     Q = (struct timeout_q *) 0;
 }
 
 void
-free_all_callouts()
+free_all_callouts(void)
 {
     struct timeout_q *p;
 
@@ -57,8 +57,7 @@ free_all_callouts()
  * happen.
  */
 void
-age_callout_queue(elapsed_time)
-    int elapsed_time;
+age_callout_queue(int elapsed_time)
 {
     struct timeout_q *ptr;
     int i = 0;
@@ -84,7 +83,7 @@ age_callout_queue(elapsed_time)
  * Return -1 if there are no events pending.
  */
 int
-timer_nextTimer()
+timer_nextTimer(void)
 {
     if (Q) {
 	if (Q->time < 0) {
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index f7283394ae..f9868c2be0 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -32,7 +32,7 @@
  *
  * @(#)compare.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.sbin/mtree/compare.c,v 1.15.2.4 2003/05/07 17:55:17 tobez Exp $
- * $DragonFly: src/usr.sbin/mtree/compare.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $
+ * $DragonFly: src/usr.sbin/mtree/compare.c,v 1.4 2003/11/22 11:38:13 eirikn Exp $
  */
 
 #include <sys/param.h>
@@ -69,10 +69,7 @@ static char *ftype(u_int);
 	}
 
 int
-compare(name, s, p)
-	char *name;
-	register NODE *s;
-	register FTSENT *p;
+compare(char *name, register NODE *s, register FTSENT *p)
 {
 	extern int uflag;
 	u_long len, val;
@@ -301,8 +298,7 @@ typeerr:		LABEL;
 }
 
 char *
-inotype(type)
-	u_int type;
+inotype(u_int type)
 {
 	switch(type & S_IFMT) {
 	case S_IFBLK:
@@ -326,8 +322,7 @@ inotype(type)
 }
 
 static char *
-ftype(type)
-	u_int type;
+ftype(u_int type)
 {
 	switch(type) {
 	case F_BLOCK:
@@ -351,8 +346,7 @@ ftype(type)
 }
 
 char *
-rlink(name)
-	char *name;
+rlink(char *name)
 {
 	static char lbuf[MAXPATHLEN];
 	register int len;
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index 357cdc6b94..757d899067 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -32,7 +32,7 @@
  *
  * @(#)create.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.sbin/mtree/create.c,v 1.18.2.3 2001/01/12 19:17:18 phk Exp $
- * $DragonFly: src/usr.sbin/mtree/create.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $
+ * $DragonFly: src/usr.sbin/mtree/create.c,v 1.4 2003/11/22 11:38:13 eirikn Exp $
  */
 
 #include <sys/param.h>
@@ -56,6 +56,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <unistd.h>
+#include <stdarg.h>
 #include <vis.h>
 #include "mtree.h"
 #include "extern.h"
@@ -82,7 +83,7 @@ static int	statd(FTS *, FTSENT *, uid_t *, gid_t *, mode_t *,
 static void	statf(int, FTSENT *);
 
 void
-cwalk()
+cwalk(void)
 {
 	register FTS *t;
 	register FTSENT *p;
@@ -141,9 +142,7 @@ cwalk()
 }
 
 static void
-statf(indent, p)
-	int indent;
-	FTSENT *p;
+statf(int indent, FTSENT *p)
 {
 	struct group *gr;
 	struct passwd *pw;
@@ -268,13 +267,8 @@ statf(indent, p)
 #define	MAXS 16
 
 static int
-statd(t, parent, puid, pgid, pmode, pflags)
-	FTS *t;
-	FTSENT *parent;
-	uid_t *puid;
-	gid_t *pgid;
-	mode_t *pmode;
-	u_long *pflags;
+statd(FTS *t, FTSENT *parent, uid_t *puid, gid_t *pgid, mode_t *pmode,
+      u_long *pflags)
 {
 	register FTSENT *p;
 	register gid_t sgid;
@@ -391,8 +385,7 @@ statd(t, parent, puid, pgid, pmode, pflags)
 }
 
 static int
-dsort(a, b)
-	const FTSENT **a, **b;
+dsort(const FTSENT **a, const FTSENT **b)
 {
 	if (S_ISDIR((*a)->fts_statp->st_mode)) {
 		if (!S_ISDIR((*b)->fts_statp->st_mode))
@@ -402,30 +395,13 @@ dsort(a, b)
 	return (strcmp((*a)->fts_name, (*b)->fts_name));
 }
 
-#if __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
 void
-#if __STDC__
 output(int indent, int *offset, const char *fmt, ...)
-#else
-output(indent, offset, fmt, va_alist)
-	int indent;
-	int *offset;
-	char *fmt;
-        va_dcl
-#endif
 {
 	va_list ap;
 	char buf[1024];
-#if __STDC__
+
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	(void)vsnprintf(buf, sizeof(buf), fmt, ap);
 	va_end(ap);
 
diff --git a/usr.sbin/mtree/misc.c b/usr.sbin/mtree/misc.c
index c8aeb56216..03453b4b12 100644
--- a/usr.sbin/mtree/misc.c
+++ b/usr.sbin/mtree/misc.c
@@ -32,7 +32,7 @@
  *
  * @(#)misc.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.sbin/mtree/misc.c,v 1.8.2.1 2000/06/28 02:33:17 joe Exp $
- * $DragonFly: src/usr.sbin/mtree/misc.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $
+ * $DragonFly: src/usr.sbin/mtree/misc.c,v 1.4 2003/11/22 11:38:13 eirikn Exp $
  */
 
 #include <sys/types.h>
@@ -82,9 +82,7 @@ static KEY keylist[] = {
 };
 
 u_int
-parsekey(name, needvaluep)
-	char *name;
-	int *needvaluep;
+parsekey(char *name, int *needvaluep)
 {
 	KEY *k, tmp;
 	int keycompare(const void *, const void *);
@@ -101,15 +99,13 @@ parsekey(name, needvaluep)
 }
 
 int
-keycompare(a, b)
-	const void *a, *b;
+keycompare(const void *a, const void *b)
 {
 	return (strcmp(((KEY *)a)->name, ((KEY *)b)->name));
 }
 
 char *
-flags_to_string(fflags)
-	u_long fflags;
+flags_to_string(u_long fflags)
 {
 	char *string;
 
diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c
index adf9b78599..c1e7401355 100644
--- a/usr.sbin/mtree/mtree.c
+++ b/usr.sbin/mtree/mtree.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1989, 1990, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)mtree.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.sbin/mtree/mtree.c,v 1.8.2.3 2003/05/07 17:55:17 tobez Exp $
- * $DragonFly: src/usr.sbin/mtree/mtree.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $
+ * $DragonFly: src/usr.sbin/mtree/mtree.c,v 1.4 2003/11/22 11:38:13 eirikn Exp $
  */
 
 #include <sys/param.h>
@@ -56,9 +56,7 @@ char fullpath[MAXPATHLEN];
 static void usage(void);
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char **argv)
 {
 	int ch;
 	char *dir, *p;
@@ -163,7 +161,7 @@ main(argc, argv)
 }
 
 static void
-usage()
+usage(void)
 {
 	(void)fprintf(stderr,
 "usage: mtree [-LPUcdeinqrux] [-f spec] [-K key] [-k key] [-p path] [-s seed]\n"
diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c
index 2e96355ad5..c8c3fc78b1 100644
--- a/usr.sbin/mtree/spec.c
+++ b/usr.sbin/mtree/spec.c
@@ -32,7 +32,7 @@
  *
  * @(#)spec.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.sbin/mtree/spec.c,v 1.13.2.1 2000/06/28 02:33:17 joe Exp $
- * $DragonFly: src/usr.sbin/mtree/spec.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $
+ * $DragonFly: src/usr.sbin/mtree/spec.c,v 1.4 2003/11/22 11:38:13 eirikn Exp $
  */
 
 #include <sys/types.h>
@@ -55,7 +55,7 @@ static void	 set(char *, NODE *);
 static void	 unset(char *, NODE *);
 
 NODE *
-spec()
+spec(void)
 {
 	register NODE *centry, *last;
 	register char *p;
@@ -166,9 +166,7 @@ noparent:		errx(1, "line %d: no parent node", lineno);
 }
 
 static void
-set(t, ip)
-	char *t;
-	NODE *ip;
+set(char *t, NODE *ip)
 {
 	register int type;
 	char *kw, *val = NULL;
@@ -308,9 +306,7 @@ set(t, ip)
 }
 
 static void
-unset(t, ip)
-	char *t;
-	register NODE *ip;
+unset(char *t, register NODE *ip)
 {
 	register char *p;
 
diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c
index 85833b5dcf..8bbb8add34 100644
--- a/usr.sbin/mtree/verify.c
+++ b/usr.sbin/mtree/verify.c
@@ -32,7 +32,7 @@
  *
  * @(#)verify.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.sbin/mtree/verify.c,v 1.10.2.2 2001/01/12 19:17:18 phk Exp $
- * $DragonFly: src/usr.sbin/mtree/verify.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $
+ * $DragonFly: src/usr.sbin/mtree/verify.c,v 1.4 2003/11/22 11:38:13 eirikn Exp $
  */
 
 #include <sys/param.h>
@@ -60,7 +60,7 @@ static void	miss(NODE *, char *);
 static int	vwalk(void);
 
 int
-verify()
+verify(void)
 {
 	int rval;
 
@@ -71,7 +71,7 @@ verify()
 }
 
 static int
-vwalk()
+vwalk(void)
 {
 	register FTS *t;
 	register FTSENT *p;
@@ -155,9 +155,7 @@ extra:
 }
 
 static void
-miss(p, tail)
-	register NODE *p;
-	register char *tail;
+miss(register NODE *p, register char *tail)
 {
 	register int create;
 	register char *tp;
-- 
2.41.0