Fix various printf() issues: too many arguments, not enough arguments, argument

order reversed, wrong modifiers. ok deraadt@ marco@ mickey@

8 files changed, 22 insertions, 19 deletions

diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index 7e000a60ec2..3994250c7a6 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aac.c,v 1.28 2006/02/06 22:11:32 jmc Exp $	*/
+/*	$OpenBSD: aac.c,v 1.29 2006/04/20 20:31:12 miod Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -1806,7 +1806,7 @@ aac_sync_fib(struct aac_softc *sc, u_int32_t command, u_int32_t xferstate,
 {
 
 	if (datasize > AAC_FIB_DATASIZE) {
-		printf("aac_sync_fib 1: datasize=%d AAC_FIB_DATASIZE\n",
+		printf("aac_sync_fib 1: datasize=%d AAC_FIB_DATASIZE %lu\n",
 		    datasize, AAC_FIB_DATASIZE);
 		return(EINVAL);
 	}
diff --git a/sys/dev/ic/am7990.c b/sys/dev/ic/am7990.c
index 5afa5991fc4..0aec5414156 100644
--- a/sys/dev/ic/am7990.c
+++ b/sys/dev/ic/am7990.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: am7990.c,v 1.40 2006/03/25 22:41:42 djm Exp $	*/
+/*	$OpenBSD: am7990.c,v 1.41 2006/04/20 20:31:12 miod Exp $	*/
 /*	$NetBSD: am7990.c,v 1.22 1996/10/13 01:37:19 christos Exp $	*/
 
 /*-
@@ -181,7 +181,7 @@ am7990_config(sc)
 		sc->sc_ntbuf = 32;
 		break;
 	default:
-		panic("am7990_config: weird memory size %d", sc->sc_memsize);
+		panic("am7990_config: weird memory size %lu", sc->sc_memsize);
 	}
 
 	printf(": address %s\n", ether_sprintf(sc->sc_arpcom.ac_enaddr));
diff --git a/sys/dev/ic/if_wi_hostap.c b/sys/dev/ic/if_wi_hostap.c
index cc0b387b75b..2b0b1765c59 100644
--- a/sys/dev/ic/if_wi_hostap.c
+++ b/sys/dev/ic/if_wi_hostap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_hostap.c,v 1.33 2005/12/03 21:11:48 brad Exp $	*/
+/*	$OpenBSD: if_wi_hostap.c,v 1.34 2006/04/20 20:31:12 miod Exp $	*/
 
 /*
  * Copyright (c) 2002
@@ -192,7 +192,7 @@ wihap_init(struct wi_softc *sc)
 	struct wihap_info *whi = &sc->wi_hostap_info;
 
 	if (sc->sc_ic.ic_if.if_flags & IFF_DEBUG)
-		printf("wihap_init: sc=0x%x whi=0x%x\n", sc, whi);
+		printf("wihap_init: sc=%p whi=%p\n", sc, whi);
 
 	bzero(whi, sizeof(struct wihap_info));
 
@@ -279,7 +279,7 @@ wihap_shutdown(struct wi_softc *sc)
 	int i, s;
 
 	if (sc->sc_ic.ic_if.if_flags & IFF_DEBUG)
-		printf("wihap_shutdown: sc=0x%x whi=0x%x\n", sc, whi);
+		printf("wihap_shutdown: sc=%p whi=%p\n", sc, whi);
 
 	if (!(whi->apflags & WIHAPFL_ACTIVE))
 		return;
@@ -295,7 +295,7 @@ wihap_shutdown(struct wi_softc *sc)
 	    sta != TAILQ_END(&whi->sta_list); sta = next) {
 		timeout_del(&sta->tmo);
 		if (sc->sc_ic.ic_if.if_flags & IFF_DEBUG)
-			printf("wihap_shutdown: FREE(sta=0x%x)\n", sta);
+			printf("wihap_shutdown: FREE(sta=%p)\n", sta);
 		next = TAILQ_NEXT(sta, list);
 		if (sta->challenge)
 			FREE(sta->challenge, M_TEMP);
diff --git a/sys/dev/ic/isp.c b/sys/dev/ic/isp.c
index a8a9440b2f6..002213f08f9 100644
--- a/sys/dev/ic/isp.c
+++ b/sys/dev/ic/isp.c
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: isp.c,v 1.35 2004/07/18 03:36:35 deraadt Exp $ */
+/* 	$OpenBSD: isp.c,v 1.36 2006/04/20 20:31:12 miod Exp $ */
 /*
  * Machine and OS Independent (well, as best as possible)
  * code for the Qlogic ISP SCSI adapters.
@@ -99,7 +99,7 @@ static const char topology[] =
 static const char swrej[] =
     "Fabric Nameserver rejected %s (Reason=0x%x Expl=0x%x) for Port ID 0x%x";
 static const char finmsg[] =
-    "(%d.%d.%d): FIN dl%d resid %d STS 0x%x SKEY %c XS_ERR=0x%x";
+    "(%d.%d.%d): FIN dl%d resid %zu STS 0x%x SKEY %c XS_ERR=0x%x";
 static const char sc0[] =
     "%s CHAN %d FTHRSH %d IID %d RESETD %d RETRYC %d RETRYD %d ASD 0x%x";
 static const char sc1[] =
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index 072a0be0d4b..1b0aebe65a9 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfi.c,v 1.20 2006/04/20 14:01:08 dlg Exp $ */
+/* $OpenBSD: mfi.c,v 1.21 2006/04/20 20:31:12 miod Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -306,8 +306,8 @@ mfi_transition_firmware(struct mfi_softc *sc)
 				break;
 		}
 		if (fw_state == cur_state) {
-			printf("%s: firmware stuck in state %#x\n", fw_state,
-			    DEVNAME(sc));
+			printf("%s: firmware stuck in state %#x\n",
+			    DEVNAME(sc), fw_state);
 			return (1);
 		}
 	}
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index 1701faa529c..bb9e526363c 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2560.c,v 1.14 2006/03/27 20:54:15 damien Exp $  */
+/*	$OpenBSD: rt2560.c,v 1.15 2006/04/20 20:31:12 miod Exp $  */
 
 /*-
  * Copyright (c) 2005, 2006
@@ -2743,7 +2743,8 @@ rt2560_init(struct ifnet *ifp)
 	/* for CardBus, power on the socket */
 	if (!(sc->sc_flags & RT2560_ENABLED)) {
 		if (sc->sc_enable != NULL && (*sc->sc_enable)(sc) != 0) {
-			printf("%s: could not enable device\n");
+			printf("%s: could not enable device\n",
+			    sc->sc_dev.dv_xname);
 			return EIO;
 		}
 		sc->sc_flags |= RT2560_ENABLED;
diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c
index 0fd7fa8a48c..f925d327e2a 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2661.c,v 1.15 2006/03/27 20:54:15 damien Exp $	*/
+/*	$OpenBSD: rt2661.c,v 1.16 2006/04/20 20:31:12 miod Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -2553,7 +2553,8 @@ rt2661_init(struct ifnet *ifp)
 	/* for CardBus, power on the socket */
 	if (!(sc->sc_flags & RT2661_ENABLED)) {
 		if (sc->sc_enable != NULL && (*sc->sc_enable)(sc) != 0) {
-			printf("%s: could not enable device\n");
+			printf("%s: could not enable device\n",
+			    sc->sc_dev.dv_xname);
 			return EIO;
 		}
 		sc->sc_flags |= RT2661_ENABLED;
diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c
index b1bfcfe4e62..874073ea00d 100644
--- a/sys/dev/ic/rtl81x9.c
+++ b/sys/dev/ic/rtl81x9.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtl81x9.c,v 1.48 2006/03/25 22:41:43 djm Exp $ */
+/*	$OpenBSD: rtl81x9.c,v 1.49 2006/04/20 20:31:12 miod Exp $ */
 
 /*
  * Copyright (c) 1997, 1998
@@ -1289,7 +1289,8 @@ rl_attach(sc)
 	for (i = 0; i < RL_TX_LIST_CNT; i++) {
 		if (bus_dmamap_create(sc->sc_dmat, MCLBYTES, 1, MCLBYTES, 0,
 		    BUS_DMA_NOWAIT, &sc->rl_cdata.rl_tx_dmamap[i]) != 0) {
-			printf("%s: can't create tx maps\n");
+			printf("%s: can't create tx maps\n",
+			    sc->sc_dev.dv_xname);
 			/* XXX free any allocated... */
 			return (1);
 		}