gcc -Wall happy

5 files changed, 13 insertions, 11 deletions

diff --git a/sys/lib/libsa/bootp.c b/sys/lib/libsa/bootp.c
index f54ee0cb487..71374cdc0ba 100644
--- a/sys/lib/libsa/bootp.c
+++ b/sys/lib/libsa/bootp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootp.c,v 1.3 1996/09/27 07:44:41 mickey Exp $	*/
+/*	$OpenBSD: bootp.c,v 1.4 1996/10/15 09:58:29 mickey Exp $	*/
 /*	$NetBSD: bootp.c,v 1.7 1995/09/18 21:19:20 pk Exp $	*/
 
 /*
@@ -175,7 +175,7 @@ bootprecv(d, pkt, len, tleft)
 	if (bp->bp_xid != htonl(d->xid)) {
 #ifdef BOOTP_DEBUG
 		if (debug) {
-			printf("bootprecv: expected xid 0x%x, got 0x%x\n",
+			printf("bootprecv: expected xid 0x%lx, got 0x%lx\n",
 			    d->xid, ntohl(bp->bp_xid));
 		}
 #endif
diff --git a/sys/lib/libsa/bootparam.c b/sys/lib/libsa/bootparam.c
index b6606bea6c7..4d83c1b78db 100644
--- a/sys/lib/libsa/bootparam.c
+++ b/sys/lib/libsa/bootparam.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootparam.c,v 1.4 1996/09/27 07:13:47 mickey Exp $	*/
+/*	$OpenBSD: bootparam.c,v 1.5 1996/10/15 09:58:32 mickey Exp $	*/
 /*	$NetBSD: bootparam.c,v 1.7 1996/02/26 23:05:14 gwr Exp $	*/
 
 /*
@@ -449,7 +449,7 @@ xdr_inaddr_decode(pkt, ia)
 	*pkt += sizeof(*xi);
 	if (xi->atype != htonl(1)) {
 #ifdef	RPC_DEBUG
-		printf("xdr_inaddr_decode: bad addrtype=%d\n",
+		printf("xdr_inaddr_decode: bad addrtype=%ld\n",
 			   ntohl(xi->atype));
 #endif
 		return(-1);
diff --git a/sys/lib/libsa/nfs.c b/sys/lib/libsa/nfs.c
index 5f70b755b8a..b31ecc8da50 100644
--- a/sys/lib/libsa/nfs.c
+++ b/sys/lib/libsa/nfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs.c,v 1.4 1996/09/27 07:13:48 mickey Exp $	*/
+/*	$OpenBSD: nfs.c,v 1.5 1996/10/15 09:58:34 mickey Exp $	*/
 /*	$NetBSD: nfs.c,v 1.15 1996/05/14 10:28:26 leo Exp $	*/
 
 /*-
@@ -371,7 +371,7 @@ nfs_close(f)
 
 #ifdef NFS_DEBUG
 	if (debug)
-		printf("nfs_close: fp=0x%x\n", fp);
+		printf("nfs_close: fp=%p\n", fp);
 #endif
 
 	if (fp)
diff --git a/sys/lib/libsa/rpc.c b/sys/lib/libsa/rpc.c
index db7ebb9f776..ad98ecd3ea1 100644
--- a/sys/lib/libsa/rpc.c
+++ b/sys/lib/libsa/rpc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc.c,v 1.3 1996/09/27 07:13:49 mickey Exp $	*/
+/*	$OpenBSD: rpc.c,v 1.4 1996/10/15 09:58:37 mickey Exp $	*/
 /*	$NetBSD: rpc.c,v 1.12 1996/02/26 23:05:26 gwr Exp $	*/
 
 /*
@@ -260,7 +260,7 @@ recvrpc(d, pkt, len, tleft)
 	if (x != rpc_xid) {
 #ifdef RPC_DEBUG
 		if (debug)
-			printf("recvrpc: rp_xid %d != xid %d\n", x, rpc_xid);
+			printf("recvrpc: rp_xid %ld != xid %d\n", x, rpc_xid);
 #endif
 		return -1;
 	}
@@ -269,7 +269,7 @@ recvrpc(d, pkt, len, tleft)
 	if (x != RPC_REPLY) {
 #ifdef RPC_DEBUG
 		if (debug)
-			printf("recvrpc: rp_direction %d != REPLY\n", x);
+			printf("recvrpc: rp_direction %ld != REPLY\n", x);
 #endif
 		return -1;
 	}
@@ -277,7 +277,7 @@ recvrpc(d, pkt, len, tleft)
 	x = ntohl(reply->rp_astatus);
 	if (x != RPC_MSGACCEPTED) {
 		errno = ntohl(reply->rp_u.rpu_errno);
-		printf("recvrpc: reject, astat=%d, errno=%d\n", x, errno);
+		printf("recvrpc: reject, astat=%ld, errno=%d\n", x, errno);
 		return -1;
 	}
 
diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h
index 9bfe239624b..40ea1883785 100644
--- a/sys/lib/libsa/stand.h
+++ b/sys/lib/libsa/stand.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stand.h,v 1.7 1996/10/15 09:41:56 mickey Exp $	*/
+/*	$OpenBSD: stand.h,v 1.8 1996/10/15 09:58:40 mickey Exp $	*/
 /*	$NetBSD: stand.h,v 1.13 1996/01/13 22:25:42 leo Exp $	*/
 
 /*-
@@ -39,6 +39,7 @@
 #include <sys/types.h>
 #include <sys/cdefs.h>
 #include <sys/stat.h>
+#include <machine/stdarg.h>
 #include "saioctl.h"
 #include "saerrno.h"
 
@@ -119,6 +120,7 @@ u_int	dkcksum __P((struct disklabel *));
 
 void	printf __P((const char *, ...));
 void	sprintf __P((char *, const char *, ...));
+void	vprintf __P((const char *format, va_list ap));
 void	twiddle __P((void));
 void	gets __P((char *));
 __dead void	panic __P((const char *, ...)) __attribute__((noreturn));