Pass -Wformat

8 files changed, 20 insertions, 20 deletions

diff --git a/sys/arch/hp300/dev/mt.c b/sys/arch/hp300/dev/mt.c
index fe7a9defa23..dc801960306 100644
--- a/sys/arch/hp300/dev/mt.c
+++ b/sys/arch/hp300/dev/mt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mt.c,v 1.11 2002/05/30 11:03:52 art Exp $	*/
+/*	$OpenBSD: mt.c,v 1.12 2003/12/20 20:08:13 miod Exp $	*/
 /*	$NetBSD: mt.c,v 1.8 1997/03/31 07:37:29 scottr Exp $	*/
 
 /* 
@@ -884,7 +884,7 @@ mtintr(arg)
 			if (i == 0)
 				sc->sc_flags |= MTF_HITEOF;
 			bp->b_resid = bp->b_bcount - i;
-			dlog(LOG_DEBUG, "%s intr: bcount %ld, resid %ld",
+			dlog(LOG_DEBUG, "%s intr: bcount %ld, resid %d",
 			    sc->sc_dev.dv_xname, bp->b_bcount, bp->b_resid);
 		} else {
 			tprintf(sc->sc_ttyp,
diff --git a/sys/arch/hp300/dev/st.c b/sys/arch/hp300/dev/st.c
index a66e857da4f..61c338d868d 100644
--- a/sys/arch/hp300/dev/st.c
+++ b/sys/arch/hp300/dev/st.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: st.c,v 1.16 2003/06/02 23:27:45 millert Exp $	*/
+/*	$OpenBSD: st.c,v 1.17 2003/12/20 20:08:13 miod Exp $	*/
 /*	$NetBSD: st.c,v 1.22 1997/04/02 22:37:38 scottr Exp $	*/
 
 /*
@@ -960,7 +960,7 @@ stintr(arg, stat)
 			 */
 			if (sc->sc_blklen) {
 				tprintf(sc->sc_ctty,
-					"%s: Incorrect Length Indicator, blkcnt diff %ld\n",
+					"%s: Incorrect Length Indicator, blkcnt diff %d\n",
 					sc->sc_dev.dv_xname,
 					sc->sc_blklen - bp->b_resid);
 				bp->b_flags |= B_ERROR;
diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c
index 9e2b9d17d84..69df3b0204c 100644
--- a/sys/arch/hp300/hp300/machdep.c
+++ b/sys/arch/hp300/hp300/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.87 2003/06/02 23:27:45 millert Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.88 2003/12/20 20:08:16 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.121 1999/03/26 23:41:29 mycroft Exp $	*/
 
 /*
@@ -342,8 +342,8 @@ cpu_startup()
 #ifdef DEBUG
 	pmapdebug = opmapdebug;
 #endif
-	printf("avail mem = %lu (%uK)\n", ptoa(uvmexp.free),
-	    ptoa(uvmexp.free)/1024);
+	printf("avail mem = %lu (%luK)\n", ptoa(uvmexp.free),
+	    ptoa(uvmexp.free) / 1024);
 	printf("using %d buffers containing %u bytes (%uK) of memory\n",
 		nbuf, bufpages * PAGE_SIZE, bufpages * PAGE_SIZE / 1024);
 
diff --git a/sys/arch/hp300/hp300/trap.c b/sys/arch/hp300/hp300/trap.c
index cff9b9c3c5d..9022f4ad51a 100644
--- a/sys/arch/hp300/hp300/trap.c
+++ b/sys/arch/hp300/hp300/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.42 2003/06/02 23:27:45 millert Exp $	*/
+/*	$OpenBSD: trap.c,v 1.43 2003/12/20 20:08:16 miod Exp $	*/
 /*	$NetBSD: trap.c,v 1.57 1998/02/16 20:58:31 thorpej Exp $	*/
 
 /*
@@ -689,9 +689,9 @@ dopanic:
 	}
 	sv.sival_ptr = (caddr_t)v;
 	trapsignal(p, i, ucode, typ, sv);
+out:
 	if ((type & T_USER) == 0)
 		return;
-out:
 	userret(p, &frame, sticks, v, 1);
 }
 
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index 1173c6081ea..bdeede84b01 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.108 2003/11/06 21:09:34 mickey Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.109 2003/12/20 20:08:17 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.207 1998/07/08 04:39:34 thorpej Exp $	*/
 
 /*
@@ -436,8 +436,8 @@ cpu_startup(void)
 	phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
 	    VM_PHYS_SIZE, 0, FALSE, NULL);
 
-	printf("avail mem = %lu (%uK)\n", ptoa(uvmexp.free),
-	    ptoa(uvmexp.free)/1024);
+	printf("avail mem = %lu (%luK)\n", ptoa(uvmexp.free),
+	    ptoa(uvmexp.free) / 1024);
 	printf("using %d buffers containing %u bytes (%uK) of memory\n",
 	    nbuf, bufpages * PAGE_SIZE, bufpages * PAGE_SIZE / 1024);
 
diff --git a/sys/arch/sparc64/dev/iommu.c b/sys/arch/sparc64/dev/iommu.c
index 7b4181a69ac..77a508533eb 100644
--- a/sys/arch/sparc64/dev/iommu.c
+++ b/sys/arch/sparc64/dev/iommu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iommu.c,v 1.33 2003/12/04 21:13:37 miod Exp $	*/
+/*	$OpenBSD: iommu.c,v 1.34 2003/12/20 20:08:17 miod Exp $	*/
 /*	$NetBSD: iommu.c,v 1.47 2002/02/08 20:03:45 eeh Exp $	*/
 
 /*
@@ -1488,7 +1488,7 @@ _iommu_dvmamap_sync(bus_dma_tag_t t, bus_dma_tag_t t0, bus_dmamap_t map,
 	}
 
 	if (i == map->dm_nsegs)
-		panic("iommu_dvmamap_sync: too short %lu", offset);
+		panic("iommu_dvmamap_sync: too short %llu", offset);
 
 	for (; len > 0 && i < map->dm_nsegs; i++) {
 		count = MIN(map->dm_segs[i].ds_len - offset, len);
@@ -1500,7 +1500,7 @@ _iommu_dvmamap_sync(bus_dma_tag_t t, bus_dma_tag_t t0, bus_dmamap_t map,
 
 #ifdef DIAGNOSTIC
 	if (i == map->dm_nsegs && len > 0)
-		panic("iommu_dvmamap_sync: leftover %lu", len);
+		panic("iommu_dvmamap_sync: leftover %llu", len);
 #endif
 
 	if (needsflush)
diff --git a/sys/arch/sparc64/dev/psycho.c b/sys/arch/sparc64/dev/psycho.c
index 9584ae4a8ba..651fdeed070 100644
--- a/sys/arch/sparc64/dev/psycho.c
+++ b/sys/arch/sparc64/dev/psycho.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psycho.c,v 1.37 2003/06/24 21:54:39 henric Exp $	*/
+/*	$OpenBSD: psycho.c,v 1.38 2003/12/20 20:08:17 miod Exp $	*/
 /*	$NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp $	*/
 
 /*
@@ -693,7 +693,7 @@ psycho_ue(void *arg)
 	/*
 	 * It's uncorrectable.  Dump the regs and panic.
 	 */
-	panic("%s: uncorrectable DMA error AFAR %llx (pa=%llx tte=%llx/%llx) "
+	panic("%s: uncorrectable DMA error AFAR %llx (pa=%lx tte=%llx/%llx) "
 	    "AFSR %llx", sc->sc_dev.dv_xname, afar,
 	    iommu_extract(sc->sc_is, (vaddr_t)afar),
 	    iommu_lookup_tte(sc->sc_is, (vaddr_t)afar),
diff --git a/sys/arch/sparc64/sparc64/db_interface.c b/sys/arch/sparc64/sparc64/db_interface.c
index 010bee27928..c2727adbce5 100644
--- a/sys/arch/sparc64/sparc64/db_interface.c
+++ b/sys/arch/sparc64/sparc64/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.17 2003/07/09 18:08:01 jason Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.18 2003/12/20 20:08:17 miod Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.61 2001/07/31 06:55:47 eeh Exp $ */
 
 /*
@@ -517,9 +517,9 @@ db_dump_dtlb(addr, have_addr, count, modif)
 		dump_dtlb(buf);
 		p = buf;
 		for (i=0; i<64;) {
-			db_printf("%2d:%16.16lx %16.16lx ", i++, p[0], p[1]);
+			db_printf("%2d:%16.16llx %16.16llx ", i++, p[0], p[1]);
 			p += 2;
-			db_printf("%2d:%16.16lx %16.16lx\n", i++, p[0], p[1]);
+			db_printf("%2d:%16.16llx %16.16llx\n", i++, p[0], p[1]);
 			p += 2;
 		}
 	}