Fixed printf format errors which apparently crept in while -Wformat was

disabled for gcc-3.

6 files changed, 12 insertions, 14 deletions

diff --git a/sys/dev/acpica/acpi_button.c b/sys/dev/acpica/acpi_button.c
index fb93377..1506895 100644
--- a/sys/dev/acpica/acpi_button.c
+++ b/sys/dev/acpica/acpi_button.c
@@ -133,13 +133,11 @@ acpi_button_notify_pressed_for_sleep(void *arg)
 
     switch (sc->button_type) {
     case ACPI_POWER_BUTTON:
-	ACPI_VPRINT(sc->button_dev, acpi_sc,
-	    "power button pressed\n", sc->button_type);
+	ACPI_VPRINT(sc->button_dev, acpi_sc, "power button pressed\n");
 	acpi_eventhandler_power_button_for_sleep((void *)acpi_sc);
 	break;
     case ACPI_SLEEP_BUTTON:
-	ACPI_VPRINT(sc->button_dev, acpi_sc,
-	    "sleep button pressed\n", sc->button_type);
+	ACPI_VPRINT(sc->button_dev, acpi_sc, "sleep button pressed\n");
 	acpi_eventhandler_sleep_button_for_sleep((void *)acpi_sc);
 	break;
     default:
@@ -164,13 +162,11 @@ acpi_button_notify_pressed_for_wakeup(void *arg)
 
     switch (sc->button_type) {
     case ACPI_POWER_BUTTON:
-	ACPI_VPRINT(sc->button_dev, acpi_sc,
-	    "wakeup by power button\n", sc->button_type);
+	ACPI_VPRINT(sc->button_dev, acpi_sc, "wakeup by power button\n");
 	acpi_eventhandler_power_button_for_wakeup((void *)acpi_sc);
 	break;
     case ACPI_SLEEP_BUTTON:
-	ACPI_VPRINT(sc->button_dev, acpi_sc,
-	    "wakeup by sleep button\n", sc->button_type);
+	ACPI_VPRINT(sc->button_dev, acpi_sc, "wakeup by sleep button\n");
 	acpi_eventhandler_sleep_button_for_wakeup((void *)acpi_sc);
 	break;
     default:
diff --git a/sys/dev/acpica/acpi_thermal.c b/sys/dev/acpica/acpi_thermal.c
index d567c0f..10ce7b2 100644
--- a/sys/dev/acpica/acpi_thermal.c
+++ b/sys/dev/acpica/acpi_thermal.c
@@ -481,7 +481,7 @@ acpi_tz_monitor(struct acpi_tz_softc *sc)
     if ((newflags & (TZ_THFLAG_HOT | TZ_THFLAG_CRT)) && 
 	!(sc->tz_thflags & (TZ_THFLAG_HOT | TZ_THFLAG_CRT))) {
 	device_printf(sc->tz_dev, "WARNING - current temperature (%d.%dC) exceeds system limits\n",
-		      TZ_KELVTOC(sc->tz_temperature), sc->tz_temperature);
+		      TZ_KELVTOC(sc->tz_temperature));
 	/* shutdown_nice(RB_POWEROFF);*/
     }
     sc->tz_thflags = newflags;
diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index b4f2cdb..688a8e1 100644
--- a/sys/dev/ata/atapi-fd.c
+++ b/sys/dev/ata/atapi-fd.c
@@ -188,7 +188,7 @@ afd_describe(struct afd_softc *fdp)
 		   fdp->cap.cylinders * fdp->cap.heads * fdp->cap.sectors,
 		   fdp->cap.cylinders, fdp->cap.heads, fdp->cap.sectors,
 		   fdp->cap.sector_size);
-	ata_prtdev(fdp->device, "%dKB/s,", fdp->lun, fdp->cap.transfer_rate/8);
+	ata_prtdev(fdp->device, "%dKB/s,", fdp->cap.transfer_rate / 8);
 	if (fdp->transfersize)
 	    printf(" transfer limit %d blks,", fdp->transfersize);
 	printf(" %s\n", ata_mode2str(fdp->device->mode));
diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index e9d21b1..1848639 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -61,7 +61,8 @@ feeder_register(void *p)
 		SLIST_INIT(&feedertab);
 		fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO);
 		if (fte == NULL) {
-			printf("can't allocate memory for root feeder\n", fc->name);
+			printf("can't allocate memory for root feeder: %s\n",
+			    fc->name);
 
 			return;
 		}
diff --git a/sys/dev/wi/wi_hostap.c b/sys/dev/wi/wi_hostap.c
index 4224dc7..905e991 100644
--- a/sys/dev/wi/wi_hostap.c
+++ b/sys/dev/wi/wi_hostap.c
@@ -819,7 +819,7 @@ wihap_deauth_req(struct wi_softc *sc, struct wi_frame *rxfrm,
 	sta = wihap_sta_find(whi, rxfrm->wi_addr2);
 	if (sta == NULL) {
 		if (sc->arpcom.ac_if.if_flags & IFF_DEBUG)
-			printf("wihap_deauth_req: unknown station: 6D\n",
+			printf("wihap_deauth_req: unknown station: %6D\n",
 			    rxfrm->wi_addr2, ":");
 	}
 	else
@@ -848,7 +848,7 @@ wihap_disassoc_req(struct wi_softc *sc, struct wi_frame *rxfrm,
 	sta = wihap_sta_find(whi, rxfrm->wi_addr2);
 	if (sta == NULL) {
 		if (sc->arpcom.ac_if.if_flags & IFF_DEBUG)
-			printf("wihap_disassoc_req: unknown station: 6D\n",
+			printf("wihap_disassoc_req: unknown station: %6D\n",
 			    rxfrm->wi_addr2, ":");
 	}
 	else if (!(sta->flags & WI_SIFLAGS_AUTHEN)) {
diff --git a/sys/i4b/capi/iavc/iavc_isa.c b/sys/i4b/capi/iavc/iavc_isa.c
index 48ad6e4..b1d53be 100644
--- a/sys/i4b/capi/iavc/iavc_isa.c
+++ b/sys/i4b/capi/iavc/iavc_isa.c
@@ -159,7 +159,8 @@ iavc_isa_probe(device_t dev)
 
 	if(ret)
 	{
-		printf("iavc%d: no card ? b1_detect returns 0x02x\n", sc->sc_unit, ret);
+		printf("iavc%d: no card ? b1_detect returns %0x02x\n",
+			sc->sc_unit, ret);
 		return(ENXIO);
 	}