remove stray K&R-isms

p4raw-id: //depot/perl@3515

5 files changed, 33 insertions, 54 deletions

diff --git a/ext/SDBM_File/sdbm/dba.c b/ext/SDBM_File/sdbm/dba.c
index 9f987fd88e..7406776398 100644
--- a/ext/SDBM_File/sdbm/dba.c
+++ b/ext/SDBM_File/sdbm/dba.c
@@ -11,8 +11,7 @@ char *progname;
 extern void oops();
 
 int
-main(argc, argv)
-char **argv;
+main(int argc, char **argv)
 {
 	int n;
 	char *p;
@@ -40,8 +39,8 @@ char **argv;
 	return 0;
 }
 
-sdump(pagf)
-int pagf;
+void
+sdump(int pagf)
 {
 	register b;
 	register n = 0;
@@ -70,8 +69,8 @@ int pagf;
 		oops("read failed: block %d", n);
 }
 
-pagestat(pag)
-char *pag;
+int
+pagestat(char *pag)
 {
 	register n;
 	register free;
diff --git a/ext/SDBM_File/sdbm/dbd.c b/ext/SDBM_File/sdbm/dbd.c
index f60f91a5f5..0a58d9a0f4 100644
--- a/ext/SDBM_File/sdbm/dbd.c
+++ b/ext/SDBM_File/sdbm/dbd.c
@@ -14,8 +14,7 @@ extern void oops();
 #define empty(page)	(((short *) page)[0] == 0)
 
 int
-main(argc, argv)
-char **argv;
+main(int argc, char **argv)
 {
 	int n;
 	char *p;
@@ -42,8 +41,8 @@ char **argv;
 	return 0;
 }
 
-sdump(pagf)
-int pagf;
+void
+sdump(int pagf)
 {
 	register r;
 	register n = 0;
@@ -68,8 +67,8 @@ int pagf;
 
 
 #ifdef OLD
-dispage(pag)
-char *pag;
+int
+dispage(char *pag)
 {
 	register i, n;
 	register off;
@@ -90,8 +89,8 @@ char *pag;
 	}
 }
 #else
-dispage(pag)
-char *pag;
+void
+dispage(char *pag)
 {
 	register i, n;
 	register off;
diff --git a/ext/SDBM_File/sdbm/dbe.c b/ext/SDBM_File/sdbm/dbe.c
index 9f44180f39..166e64efdf 100644
--- a/ext/SDBM_File/sdbm/dbe.c
+++ b/ext/SDBM_File/sdbm/dbe.c
@@ -52,10 +52,7 @@ char *optarg;			       /* Global argument pointer. */
 #endif
 
 char
-getopt(argc, argv, optstring)
-int argc;
-char **argv;
-char *optstring;
+getopt(int argc, char **argv, char *optstring)
 {
 	register int c;
 	register char *place;
@@ -131,8 +128,7 @@ char *optstring;
 
 
 void
-print_datum(db)
-datum db;
+print_datum(datum db)
 {
 	int i;
 
@@ -152,8 +148,7 @@ datum db;
 
 
 datum
-read_datum(s)
-char *s;
+read_datum(char *s)
 {
 	datum db;
 	char *p;
@@ -197,8 +192,7 @@ char *s;
 
 
 char *
-key2s(db)
-datum db;
+key2s(datum db)
 {
 	char *buf;
 	char *p1, *p2;
@@ -211,10 +205,8 @@ datum db;
 	return buf;
 }
 
-
-main(argc, argv)
-int argc;
-char **argv;
+int
+main(int argc, char **argv)
 {
 	typedef enum {
 		YOW, FETCH, STORE, DELETE, SCAN, REGEXP
diff --git a/ext/SDBM_File/sdbm/dbm.c b/ext/SDBM_File/sdbm/dbm.c
index 1388230e2d..dc47d7001d 100644
--- a/ext/SDBM_File/sdbm/dbm.c
+++ b/ext/SDBM_File/sdbm/dbm.c
@@ -27,8 +27,8 @@ static DBM *cur_db = NODB;
 
 static char no_db[] = "dbm: no open database\n";
 
-dbminit(file)
-    char *file;
+int
+dbminit(char *file)
 {
     if (cur_db != NODB)
         dbm_close(cur_db);
@@ -43,8 +43,7 @@ dbminit(file)
 }
 
 long
-forder(key)
-datum key;
+forder(datum key)
 {
     if (cur_db == NODB) {
         printf(no_db);
@@ -54,8 +53,7 @@ datum key;
 }
 
 datum
-fetch(key)
-datum key;
+fetch(datum key)
 {
     datum item;
 
@@ -67,8 +65,8 @@ datum key;
     return (dbm_fetch(cur_db, key));
 }
 
-delete(key)
-datum key;
+int
+delete(datum key)
 {
     if (cur_db == NODB) {
         printf(no_db);
@@ -79,8 +77,8 @@ datum key;
     return (dbm_delete(cur_db, key));
 }
 
-store(key, dat)
-datum key, dat;
+int
+store(datum key, datum dat)
 {
     if (cur_db == NODB) {
         printf(no_db);
@@ -93,7 +91,7 @@ datum key, dat;
 }
 
 datum
-firstkey()
+firstkey(void)
 {
     datum item;
 
@@ -106,8 +104,7 @@ firstkey()
 }
 
 datum
-nextkey(key)
-datum key;
+nextkey(datum key)
 {
     datum item;
 
diff --git a/ext/SDBM_File/sdbm/dbu.c b/ext/SDBM_File/sdbm/dbu.c
index a3c0004da9..e68b78de44 100644
--- a/ext/SDBM_File/sdbm/dbu.c
+++ b/ext/SDBM_File/sdbm/dbu.c
@@ -65,9 +65,7 @@ static cmd *parse();
 static void badk(), doit(), prdatum();
 
 int
-main(argc, argv)
-int	argc;
-char *argv[];
+main(int argc, char **argv)
 {
 	int c;
 	register cmd *act;
@@ -98,9 +96,7 @@ char *argv[];
 }
 
 static void
-doit(act, file)
-register cmd *act;
-char *file;
+doit(register cmd *act, char *file)
 {
 	datum key;
 	datum val;
@@ -197,8 +193,7 @@ char *file;
 }
 
 static void
-badk(word)
-char *word;
+badk(char *word)
 {
 	register int i;
 
@@ -214,8 +209,7 @@ char *word;
 }
 
 static cmd *
-parse(str)
-register char *str;
+parse(register char *str)
 {
 	register int i = CTABSIZ;
 	register cmd *p;
@@ -227,9 +221,7 @@ register char *str;
 }
 
 static void
-prdatum(stream, d)
-FILE *stream;
-datum d;
+prdatum(FILE *stream, datum d)
 {
 	register int c;
 	register char *p = d.dptr;