cleanup for !ANSI compilers, mostly __P usage

5 files changed, 16 insertions, 11 deletions

diff --git a/sys/lib/libsa/bootparam.c b/sys/lib/libsa/bootparam.c
index f81b5041c85..fa219a14014 100644
--- a/sys/lib/libsa/bootparam.c
+++ b/sys/lib/libsa/bootparam.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootparam.c,v 1.7 1996/12/08 15:15:47 niklas Exp $	*/
+/*	$OpenBSD: bootparam.c,v 1.8 1998/05/31 23:39:16 mickey Exp $	*/
 /*	$NetBSD: bootparam.c,v 1.10 1996/10/14 21:16:55 thorpej Exp $	*/
 
 /*
@@ -54,7 +54,7 @@
 #ifdef DEBUG_RPC
 #define RPC_PRINTF(a)	printf a
 #else
-#define RPC_PRINTF(a)
+#define RPC_PRINTF(a)	/* printf a */
 #endif
 
 struct in_addr	bp_server_addr;	/* net order */
diff --git a/sys/lib/libsa/bootparam.h b/sys/lib/libsa/bootparam.h
index 57848423829..3581194606a 100644
--- a/sys/lib/libsa/bootparam.h
+++ b/sys/lib/libsa/bootparam.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: bootparam.h,v 1.2 1996/09/23 14:18:49 mickey Exp $	*/
+/*	$OpenBSD: bootparam.h,v 1.3 1998/05/31 23:39:18 mickey Exp $	*/
 
-int bp_whoami(int sock);
-int bp_getfile(int sock, char *key, struct in_addr *addrp, char *path);
+int bp_whoami __P((int sock));
+int bp_getfile __P((int sock, char *key, struct in_addr *addrp, char *path));
 
diff --git a/sys/lib/libsa/net.c b/sys/lib/libsa/net.c
index dd6bb231a67..706b0dacb63 100644
--- a/sys/lib/libsa/net.c
+++ b/sys/lib/libsa/net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: net.c,v 1.9 1998/02/23 20:32:27 niklas Exp $	*/
+/*	$OpenBSD: net.c,v 1.10 1998/05/31 23:39:15 mickey Exp $	*/
 /*	$NetBSD: net.c,v 1.14 1996/10/13 02:29:02 christos Exp $	*/
 
 /*
@@ -278,10 +278,10 @@ readudp(d, pkt, len, tleft)
 ssize_t
 sendrecv(d, sproc, sbuf, ssize, rproc, rbuf, rsize)
 	register struct iodesc *d;
-	register ssize_t (*sproc)(struct iodesc *, void *, size_t);
+	register ssize_t (*sproc) __P((struct iodesc *, void *, size_t));
 	register void *sbuf;
 	register size_t ssize;
-	register ssize_t (*rproc)(struct iodesc *, void *, size_t, time_t);
+	register ssize_t (*rproc) __P((struct iodesc *, void *, size_t, time_t));
 	register void *rbuf;
 	register size_t rsize;
 {
diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h
index e7c2e65bb8d..47fdac55f2e 100644
--- a/sys/lib/libsa/stand.h
+++ b/sys/lib/libsa/stand.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stand.h,v 1.32 1998/05/29 20:44:47 mickey Exp $	*/
+/*	$OpenBSD: stand.h,v 1.33 1998/05/31 23:39:14 mickey Exp $	*/
 /*	$NetBSD: stand.h,v 1.18 1996/11/30 04:35:51 gwr Exp $	*/
 
 /*-
@@ -39,7 +39,11 @@
 #include <sys/types.h>
 #include <sys/cdefs.h>
 #include <sys/stat.h>
+#ifdef __STDC__
 #include <machine/stdarg.h>
+#else
+#include <machine/varargs.h>
+#endif
 #include "saioctl.h"
 #include "saerrno.h"
 
diff --git a/sys/stand/boot/cmd.c b/sys/stand/boot/cmd.c
index 832b000b0cb..f569afcaf17 100644
--- a/sys/stand/boot/cmd.c
+++ b/sys/stand/boot/cmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.c,v 1.39 1998/05/30 01:48:31 mickey Exp $	*/
+/*	$OpenBSD: cmd.c,v 1.40 1998/05/31 23:41:47 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997,1998 Michael Shalayeff
@@ -287,7 +287,8 @@ nextword(p)
 }
 
 static void
-print_help(register const struct cmd_table *ct)
+print_help(ct)
+	register const struct cmd_table *ct;
 {
 	for (; ct->cmd_name != NULL; ct++)
 		printf(" %s", ct->cmd_name);