ansi and protos

3 files changed, 15 insertions, 36 deletions

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;