ansi and protos

13 files changed, 63 insertions, 117 deletions

diff --git a/usr.sbin/fdformat/fdformat.c b/usr.sbin/fdformat/fdformat.c
index cc947bbc755..65548601af3 100644
--- a/usr.sbin/fdformat/fdformat.c
+++ b/usr.sbin/fdformat/fdformat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdformat.c,v 1.11 2003/03/08 11:49:32 matthieu Exp $	*/
+/*	$OpenBSD: fdformat.c,v 1.12 2003/06/26 21:36:39 deraadt Exp $	*/
 
 /*
  * Copyright (C) 1992-1994 by Joerg Wunsch, Dresden
@@ -57,9 +57,8 @@
 extern const char *__progname;
 
 static void
-format_track(fd, cyl, secs, head, rate, gaplen, secsize, fill, interleave)
-	int fd, cyl, secs, head, rate, gaplen, secsize;
-	int fill, interleave;
+format_track(int fd, int cyl, int secs, int head, int rate, int gaplen,
+    int secsize, int fill, int interleave)
 {
 	struct fd_formb f;
 	int i,j;
@@ -93,8 +92,7 @@ format_track(fd, cyl, secs, head, rate, gaplen, secsize, fill, interleave)
 }
 
 static int
-verify_track(fd, track, tracksize)
-	int fd, track, tracksize;
+verify_track(int fd, int track, int tracksize)
 {
 	static char *buf = 0;
 	static int bufsz = 0;
@@ -132,7 +130,7 @@ verify_track(fd, track, tracksize)
 }
 
 static void
-usage ()
+usage(void)
 {
 	printf("Usage:\n\t%s [-q] [-n | -v] [-c #] [-s #] [-h #]\n",
 		__progname);
@@ -156,7 +154,7 @@ usage ()
 }
 
 static int
-yes ()
+yes(void)
 {
 	char reply [256], *p;
 
@@ -176,9 +174,7 @@ yes ()
 }
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	int cyls = -1, secs = -1, heads = -1, intleave = -1;
 	int rate = -1, gaplen = -1, secsize = -1, steps = -1;
diff --git a/usr.sbin/kvm_mkdb/kvm_mkdb.c b/usr.sbin/kvm_mkdb/kvm_mkdb.c
index f549e929b1b..b5aaee3b9fa 100644
--- a/usr.sbin/kvm_mkdb/kvm_mkdb.c
+++ b/usr.sbin/kvm_mkdb/kvm_mkdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_mkdb.c,v 1.13 2003/06/02 23:36:53 millert Exp $	*/
+/*	$OpenBSD: kvm_mkdb.c,v 1.14 2003/06/26 21:36:39 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -39,7 +39,7 @@ static const char copyright[] =
 #if 0
 static char sccsid[] = "from: @(#)kvm_mkdb.c	8.3 (Berkeley) 5/4/95";
 #else
-static const char rcsid[] = "$OpenBSD: kvm_mkdb.c,v 1.13 2003/06/02 23:36:53 millert Exp $";
+static const char rcsid[] = "$OpenBSD: kvm_mkdb.c,v 1.14 2003/06/26 21:36:39 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -76,9 +76,7 @@ HASHINFO openinfo = {
 };
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	struct rlimit rl;
 	int fd, rval, ch, verbose = 0;
@@ -129,11 +127,7 @@ main(argc, argv)
 }
 
 int
-kvm_mkdb(fd, nlistpath, nlistname, verbose)
-	int fd;
-	char *nlistpath;
-	char *nlistname;
-	int verbose;
+kvm_mkdb(int fd, char *nlistpath, char *nlistname, int verbose)
 {
 	DB *db;
 	char dbtemp[MAXPATHLEN], dbname[MAXPATHLEN];
@@ -178,7 +172,7 @@ kvm_mkdb(fd, nlistpath, nlistname, verbose)
 }
 
 void
-usage()
+usage(void)
 {
 	(void)fprintf(stderr, "usage: kvm_mkdb [-v] [file]\n");
 	exit(1);
diff --git a/usr.sbin/kvm_mkdb/nlist.c b/usr.sbin/kvm_mkdb/nlist.c
index 43857ca735f..cf4b80c4c74 100644
--- a/usr.sbin/kvm_mkdb/nlist.c
+++ b/usr.sbin/kvm_mkdb/nlist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nlist.c,v 1.33 2003/06/02 23:36:53 millert Exp $	*/
+/*	$OpenBSD: nlist.c,v 1.34 2003/06/26 21:36:39 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -33,7 +33,7 @@
 #if 0
 static char sccsid[] = "from: @(#)nlist.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: nlist.c,v 1.33 2003/06/02 23:36:53 millert Exp $";
+static const char rcsid[] = "$OpenBSD: nlist.c,v 1.34 2003/06/26 21:36:39 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -79,10 +79,7 @@ static char *fmterr;
 static u_long get_kerntext(char *kfn, u_int magic);
 
 int
-__aout_knlist(fd, db, ksyms)
-	int fd;
-	DB *db;
-	int ksyms;
+__aout_knlist(int fd, DB *db, int ksyms)
 {
 	int nsyms;
 	struct exec ebuf;
@@ -269,9 +266,7 @@ __aout_knlist(fd, db, ksyms)
 #endif
 
 static u_long
-get_kerntext(name, magic)
-	char *name;
-	u_int magic;
+get_kerntext(char *name, u_int magic)
 {
 	NLIST nl[2];
 
@@ -288,10 +283,7 @@ get_kerntext(name, magic)
 
 #ifdef _NLIST_DO_ELF
 int
-__elf_knlist(fd, db, ksyms)
-	int fd;
-	DB *db;
-	int ksyms;
+__elf_knlist(int fd, DB *db, int ksyms)
 {
 	caddr_t strtab;
 	off_t symstroff, symoff;
@@ -539,10 +531,7 @@ __elf_knlist(fd, db, ksyms)
 				 (p) < (e)->a.data_start + (e)->a.dsize)
 
 int
-__ecoff_knlist(fd, db, ksyms)
-	int fd;
-	DB *db;
-	int ksyms;
+__ecoff_knlist(int fd, DB *db, int ksyms)
 {
 	struct ecoff_exechdr *exechdrp;
 	struct ecoff_symhdr *symhdrp;
@@ -677,10 +666,7 @@ static struct knlist_handlers {
 };
 
 int
-create_knlist(name, fd, db)
-	char *name;
-	int fd;
-	DB *db;
+create_knlist(char *name, int fd, DB *db)
 {
 	int i, error, ksyms;
 
diff --git a/usr.sbin/kvm_mkdb/testdb.c b/usr.sbin/kvm_mkdb/testdb.c
index 0d98b47da82..6812308d875 100644
--- a/usr.sbin/kvm_mkdb/testdb.c
+++ b/usr.sbin/kvm_mkdb/testdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: testdb.c,v 1.5 2003/06/02 23:36:53 millert Exp $	*/
+/*	$OpenBSD: testdb.c,v 1.6 2003/06/26 21:36:39 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -33,7 +33,7 @@
 #if 0
 static char sccsid[] = "from: @(#)testdb.c	8.1 (Berkeley) 6/6/93";
 #else
-static char *rcsid = "$OpenBSD: testdb.c,v 1.5 2003/06/02 23:36:53 millert Exp $";
+static char *rcsid = "$OpenBSD: testdb.c,v 1.6 2003/06/26 21:36:39 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -52,8 +52,7 @@ static char *rcsid = "$OpenBSD: testdb.c,v 1.5 2003/06/02 23:36:53 millert Exp $
 
 /* Return true if the db file is valid, else false */
 int
-testdb(dbname)
-	char *dbname;
+testdb(char *dbname)
 {
 	DB *db;
 	int cc, kd, ret, dbversionlen;
diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
index 821cfddeb7c..c3b959d609c 100644
--- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
+++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netgroup_mkdb.c,v 1.10 2002/02/17 19:42:38 millert Exp $	*/
+/*	$OpenBSD: netgroup_mkdb.c,v 1.11 2003/06/26 21:36:39 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 #ifndef lint
-static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.10 2002/02/17 19:42:38 millert Exp $";
+static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.11 2003/06/26 21:36:39 deraadt Exp $";
 #endif
 
 #include <sys/types.h>
@@ -96,9 +96,7 @@ static const char ng_empty[] = "";
 static char    *dbname = _PATH_NETGROUP_DB;
 
 int
-main(argc, argv)
-	int		  argc;
-	char		**argv;
+main(int argc, char *argv[])
 {
 	DB		 *db, *ndb, *hdb, *udb;
 	int               ch;
@@ -185,9 +183,10 @@ main(argc, argv)
  * cleanup(): Remove temporary files upon exit
  */
 static void
-cleanup()
+cleanup(void)
 {
 	char buf[MAXPATHLEN];
+
 	(void) snprintf(buf, sizeof(buf), "%s.tmp", dbname);
 	(void) unlink(buf);
 }
@@ -198,8 +197,7 @@ cleanup()
  * ng_load(): Load the netgroup database from a file
  */
 static DB *
-ng_load(fname)
-	const char     *fname;
+ng_load(const char *fname)
 {
 	FILE           *fp;
 	DB             *db;
@@ -303,9 +301,7 @@ ng_load(fname)
  * string database
  */
 static DB *
-ng_insert(db, name)
-	DB             *db;
-	const char     *name;
+ng_insert(DB *db, const char *name)
 {
 	DB             *xdb = NULL;
 	DBT             key, data;
@@ -356,12 +352,8 @@ ng_insert(db, name)
  * ng_reventry(): Recursively add all the netgroups to the group entry.
  */
 static void
-ng_reventry(db, udb, fe, name, s, ss)
-	DB             *db, *udb;
-	struct nentry  *fe;
-	char           *name;
-	size_t          s;
-	struct stringlist *ss;
+ng_reventry(DB *db, DB *udb, struct nentry *fe, char *name, size_t s,
+    struct stringlist *ss)
 {
 	DBT             key, data;
 	struct nentry  *e;
@@ -436,9 +428,7 @@ ng_reventry(db, udb, fe, name, s, ss)
  * ng_reverse(): Reverse the database
  */
 static DB *
-ng_reverse(db, s)
-	DB             *db;
-	size_t          s;
+ng_reverse(DB *db, size_t s)
 {
 	int             pos;
 	struct stringlist *sl;
@@ -475,9 +465,7 @@ ng_reverse(db, s)
  * ng_print(): Pretty print a netgroup entry
  */
 static void
-ng_print(e, str)
-	struct nentry  *e;
-	struct string  *str;
+ng_print(struct nentry *e, struct string *str)
 {
 	char           *ptr = emalloc(e->n_size);
 
@@ -513,9 +501,7 @@ ng_print(e, str)
  * ng_rprint(): Pretty print all reverse netgroup mappings in the given entry
  */
 static void
-ng_rprint(db, str)
-	DB             *db;
-	struct string  *str;
+ng_rprint(DB *db, struct string *str)
 {
 	int             pos;
 	DBT             key, data;
@@ -541,8 +527,7 @@ ng_rprint(db, str)
  * ng_dump(): Pretty print all netgroups in the given database
  */
 static void
-ng_dump(db)
-	DB             *db;
+ng_dump(DB *db)
 {
 	int             pos;
 	DBT             key, data;
@@ -576,8 +561,7 @@ ng_dump(db)
  * ng_rdump(): Pretty print all reverse mappings in the given database
  */
 static void
-ng_rdump(db)
-	DB             *db;
+ng_rdump(DB *db)
 {
 	int             pos;
 	DBT             key, data;
@@ -611,9 +595,7 @@ ng_rdump(db)
  * ng_write(): Dump the database into a file.
  */
 static void
-ng_write(odb, idb, k)
-	DB             *odb, *idb;
-	int             k;
+ng_write(DB *odb, DB *idb, int k)
 {
 	int             pos;
 	DBT             key, data;
@@ -667,10 +649,7 @@ ng_write(odb, idb, k)
  * ng_rwrite(): Write the database
  */
 static void
-ng_rwrite(odb, idb, k)
-	DB             *odb;
-	DB             *idb;
-	int             k;
+ng_rwrite(DB *odb, DB *idb, int k)
 {
 	int             pos;
 	DBT             key, data;
@@ -723,7 +702,7 @@ ng_rwrite(odb, idb, k)
  * usage(): Print usage message and exit
  */
 static void
-usage()
+usage(void)
 {
 	extern const char *__progname;
 	fprintf(stderr, "usage: %s [-o db] file\n", __progname);
diff --git a/usr.sbin/sliplogin/sliplogin.c b/usr.sbin/sliplogin/sliplogin.c
index 361b785f802..961631ba0de 100644
--- a/usr.sbin/sliplogin/sliplogin.c
+++ b/usr.sbin/sliplogin/sliplogin.c
@@ -35,7 +35,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)sliplogin.c	5.6 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$Id: sliplogin.c,v 1.22 2003/06/02 23:36:54 millert Exp $";
+static char rcsid[] = "$Id: sliplogin.c,v 1.23 2003/06/26 21:36:39 deraadt Exp $";
 #endif /* not lint */
 
 /*
@@ -102,8 +102,7 @@ char	loginfile[MAXPATHLEN];
 char	loginname[BUFSIZ];
 
 void
-findid(name)
-	char *name;
+findid(char *name)
 {
 	FILE *fp;
 	static char slopt[5][16];
@@ -160,8 +159,7 @@ findid(name)
 }
 
 const char *
-sigstr(s)
-	int s;
+sigstr(int s)
 {
 	if (s > 0 && s < NSIG)
 		return(sys_signame[s]);
@@ -175,16 +173,13 @@ sigstr(s)
 volatile sig_atomic_t die;
 
 void
-hup_handler(s)
-	int s;
+hup_handler(int s)
 {
 	die = 1;
 }
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	int fd, s, ldisc, odisc;
 	char *name;
diff --git a/usr.sbin/slstats/slstats.c b/usr.sbin/slstats/slstats.c
index ef416b56bfd..7abbfbbd211 100644
--- a/usr.sbin/slstats/slstats.c
+++ b/usr.sbin/slstats/slstats.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: slstats.c,v 1.15 2002/06/18 17:29:02 deraadt Exp $	*/
+/*	$OpenBSD: slstats.c,v 1.16 2003/06/26 21:36:39 deraadt Exp $	*/
 /*	$NetBSD: slstats.c,v 1.6.6.1 1996/06/07 01:42:30 thorpej Exp $	*/
 
 /*
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: slstats.c,v 1.15 2002/06/18 17:29:02 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: slstats.c,v 1.16 2003/06/26 21:36:39 deraadt Exp $";
 #endif
 
 #define INET
@@ -83,9 +83,7 @@ void	intpr(void);
 void	usage(void);
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	struct ifreq ifr;
 	int ch;
@@ -145,8 +143,7 @@ usage()
 volatile sig_atomic_t	signalled; 	/* set if alarm goes off "early" */
 
 static void
-get_sl_stats(curp)
-	struct sl_stats *curp;
+get_sl_stats(struct sl_stats *curp)
 {
 	struct ifslstatsreq req;
 
@@ -169,7 +166,7 @@ get_sl_stats(curp)
  * First line printed at top of screen is always cumulative.
  */
 void
-intpr()
+intpr(void)
 {
 	struct sl_stats cur, old;
 	sigset_t mask, oldmask;
@@ -179,7 +176,7 @@ intpr()
 	while (1) {
 		get_sl_stats(&cur);
 
-		(void)signal(SIGALRM, (void (*)())catchalarm);
+		(void)signal(SIGALRM, (void (*)(int))catchalarm);
 		signalled = 0;
 		(void)alarm(interval);
 
diff --git a/usr.sbin/tcpdump/interface.h b/usr.sbin/tcpdump/interface.h
index cb79efa17e7..8b7e4a97c2a 100644
--- a/usr.sbin/tcpdump/interface.h
+++ b/usr.sbin/tcpdump/interface.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: interface.h,v 1.38 2003/06/11 20:58:45 markus Exp $	*/
+/*	$OpenBSD: interface.h,v 1.39 2003/06/26 21:36:39 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -20,7 +20,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/interface.h,v 1.38 2003/06/11 20:58:45 markus Exp $ (LBL)
+ * @(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/interface.h,v 1.39 2003/06/26 21:36:39 deraadt Exp $ (LBL)
  */
 
 #ifndef tcpdump_interface_h
@@ -230,6 +230,7 @@ extern void ospf_print(const u_char *, u_int, const u_char *);
 extern void mobile_print(const u_char *, u_int);
 extern void pim_print(const u_char *, u_int);
 extern void ppp_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
+extern void ppp_hdlc_print(const u_char *, int);
 extern void raw_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
 extern void rip_print(const u_char *, u_int);
 extern void sl_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
diff --git a/usr.sbin/timed/timed/slave.c b/usr.sbin/timed/timed/slave.c
index d1351c4362d..127cbf3656a 100644
--- a/usr.sbin/timed/timed/slave.c
+++ b/usr.sbin/timed/timed/slave.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: slave.c,v 1.9 2003/06/12 21:09:48 deraadt Exp $	*/
+/*	$OpenBSD: slave.c,v 1.10 2003/06/26 21:36:40 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -69,7 +69,6 @@ slave(void)
 	struct timeval ntime, wait, tmptv;
 	time_t tmpt;
 	struct tsp *answer;
-	int timeout();
 	char olddate[32];
 	char newdate[32];
 	struct netinfo *ntp;
diff --git a/usr.sbin/timed/timedc/cmds.c b/usr.sbin/timed/timedc/cmds.c
index 8fb3be6ce7c..04dc8c78871 100644
--- a/usr.sbin/timed/timedc/cmds.c
+++ b/usr.sbin/timed/timedc/cmds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmds.c,v 1.17 2003/06/12 21:09:48 deraadt Exp $	*/
+/*	$OpenBSD: cmds.c,v 1.18 2003/06/26 21:36:40 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -34,7 +34,7 @@ static char sccsid[] = "@(#)cmds.c	5.1 (Berkeley) 5/11/93";
 #endif /* not lint */
 
 #ifdef sgi
-#ident "$Revision: 1.17 $"
+#ident "$Revision: 1.18 $"
 #endif
 
 #include "timedc.h"
@@ -396,7 +396,7 @@ bail:
  * quits timedc
  */
 void
-quit(void)
+quit(int ignored, char *unused[])
 {
 	exit(0);
 }
diff --git a/usr.sbin/timed/timedc/timedc-extern.h b/usr.sbin/timed/timedc/timedc-extern.h
index cd47e2a47fd..271ef057029 100644
--- a/usr.sbin/timed/timedc/timedc-extern.h
+++ b/usr.sbin/timed/timedc/timedc-extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: timedc-extern.h,v 1.5 2003/06/02 23:36:55 millert Exp $	*/
+/*	$OpenBSD: timedc-extern.h,v 1.6 2003/06/26 21:36:40 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1993 The Regents of the University of California.
@@ -39,7 +39,7 @@ void	clockdiff(int, char *[]);
 void	help(int, char *[]);
 void	makeargv(void);
 void	msite(int, char *[]);
-void	quit(void);
+void	quit(int, char *[]);
 void	testing(int, char *[]);
 void	tracing(int, char *[]);
 
diff --git a/usr.sbin/timed/timedc/timedc.c b/usr.sbin/timed/timedc/timedc.c
index 6233dbe0efd..7b2bae9b4d5 100644
--- a/usr.sbin/timed/timedc/timedc.c
+++ b/usr.sbin/timed/timedc/timedc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: timedc.c,v 1.10 2003/06/12 21:09:48 deraadt Exp $	*/
+/*	$OpenBSD: timedc.c,v 1.11 2003/06/26 21:36:40 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -127,7 +127,7 @@ main(int argc, char *argv[])
 				siginterrupt(SIGINT, 0);
 				continue;
 			}
-			quit();
+			quit(0, NULL);
 		}
 		siginterrupt(SIGINT, 0);
 
diff --git a/usr.sbin/timed/timedc/timedc.h b/usr.sbin/timed/timedc/timedc.h
index 7895df7e24f..690fc38710f 100644
--- a/usr.sbin/timed/timedc/timedc.h
+++ b/usr.sbin/timed/timedc/timedc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: timedc.h,v 1.4 2003/06/02 23:36:55 millert Exp $	*/
+/*	$OpenBSD: timedc.h,v 1.5 2003/06/26 21:36:40 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -57,7 +57,7 @@ extern int errno;
 struct	cmd {
 	char	*c_name;		/* command name */
 	char	*c_help;		/* help message */
-	void	(*c_handler)();		/* routine to do the work */
+	void	(*c_handler)(int, char **);	/* routine to do the work */
 	int	c_priv;			/* privileged command */
 };