- fix format strings for values that are daddr64_t

ok otto@, agreed by deraadt@

7 files changed, 24 insertions, 24 deletions

diff --git a/sys/arch/alpha/stand/installboot.c b/sys/arch/alpha/stand/installboot.c
index 6ee4487ef65..c3f05949ed8 100644
--- a/sys/arch/alpha/stand/installboot.c
+++ b/sys/arch/alpha/stand/installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: installboot.c,v 1.14 2007/06/06 17:15:11 deraadt Exp $	*/
+/*	$OpenBSD: installboot.c,v 1.15 2009/08/24 08:52:13 jasper Exp $	*/
 /*	$NetBSD: installboot.c,v 1.2 1997/04/06 08:41:12 cgd Exp $	*/
 
 /*
@@ -175,7 +175,7 @@ main(int argc, char *argv[])
 		partoffset = 0;
 	}
 	if (verbose)
-		(void)printf("%s partition offset = 0x%lx\n", boot, partoffset);
+		(void)printf("%s partition offset = 0x%llx\n", boot, partoffset);
 
 	/* Sync filesystems (make sure boot's block numbers are stable) */
 	sync();
diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c
index 5fc24a0a1c5..5d43b09034e 100644
--- a/sys/arch/hp300/dev/hd.c
+++ b/sys/arch/hp300/dev/hd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hd.c,v 1.58 2009/08/16 12:17:35 miod Exp $	*/
+/*	$OpenBSD: hd.c,v 1.59 2009/08/24 08:52:13 jasper Exp $	*/
 /*	$NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $	*/
 
 /*
@@ -1079,7 +1079,7 @@ hderror(unit)
 		hdprinterr("fault", sp->c_fef, err_fault);
 		hdprinterr("access", sp->c_aef, err_access);
 		hdprinterr("info", sp->c_ief, err_info);
-		printf("    block: %d, P1-P10: ", hwbn);
+		printf("    block: %lld, P1-P10: ", hwbn);
 		printf("0x%04x", *(u_int *)&sp->c_raw[0]);
 		printf("%04x", *(u_int *)&sp->c_raw[4]);
 		printf("%02x\n", *(u_short *)&sp->c_raw[8]);
diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index 070f4c029e1..83124fddde7 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.66 2009/08/13 15:23:12 deraadt Exp $	*/
+/*	$OpenBSD: fd.c,v 1.67 2009/08/24 08:52:13 jasper Exp $	*/
 /*	$NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $	*/
 
 /*-
@@ -716,7 +716,7 @@ fdstrategy(bp)
 
 #ifdef FD_DEBUG
 	if (fdc_debug > 1)
-	    printf("fdstrategy: b_blkno %d b_bcount %ld blkno %d cylin %ld\n",
+	    printf("fdstrategy: b_blkno %d b_bcount %ld blkno %lld cylin %ld\n",
 		    bp->b_blkno, bp->b_bcount, fd->sc_blkno, bp->b_cylinder);
 #endif
 
@@ -1371,7 +1371,7 @@ loop:
 		{int block;
 		 block = (fd->sc_cylin * type->heads + head) * type->sectrac + sec;
 		 if (block != fd->sc_blkno) {
-			 printf("fdcintr: block %d != blkno %d\n", block, fd->sc_blkno);
+			 printf("fdcintr: block %d != blkno %lld\n", block, fd->sc_blkno);
 #if defined(FD_DEBUG) && defined(DDB)
 			 Debugger();
 #endif
@@ -1498,7 +1498,7 @@ loop:
 				fdcstatus(fdc,
 					bp->b_flags & B_READ
 					? "read failed" : "write failed");
-				printf("blkno %d nblks %d nstat %d tc %d\n",
+				printf("blkno %lld nblks %d nstat %d tc %d\n",
 				       fd->sc_blkno, fd->sc_nblks,
 				       fdc->sc_nstat, fdc->sc_tc);
 			}
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index d6c13072962..e598bc2caa9 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccd.c,v 1.87 2009/08/13 15:23:11 deraadt Exp $	*/
+/*	$OpenBSD: ccd.c,v 1.88 2009/08/24 08:51:18 jasper Exp $	*/
 /*	$NetBSD: ccd.c,v 1.33 1996/05/05 04:21:14 thorpej Exp $	*/
 
 /*-
@@ -809,7 +809,7 @@ ccdbuffer(struct ccd_softc *cs, struct buf *bp, daddr64_t bn, caddr_t addr,
 		}
 		cbn *= cs->sc_ileave;
 		ci = &cs->sc_cinfo[ccdisk];
-		CCD_DPRINTF(CCDB_IO, ("ccdisk %d cbn %d ci %p ci2 %p\n",
+		CCD_DPRINTF(CCDB_IO, ("ccdisk %d cbn %lld ci %p ci2 %p\n",
 		    ccdisk, cbn, ci, ci2));
 	}
 
@@ -863,7 +863,7 @@ ccdbuffer(struct ccd_softc *cs, struct buf *bp, daddr64_t bn, caddr_t addr,
 		cbp->cb_dep = cbp2;
 	}
 
-	CCD_DPRINTF(CCDB_IO, (" dev %x(u%d): cbp %p bn %d addr %p bcnt %ld\n",
+	CCD_DPRINTF(CCDB_IO, (" dev %x(u%d): cbp %p bn %lld addr %p bcnt %ld\n",
 	    ci->ci_dev, ci-cs->sc_cinfo, cbp, bp->b_blkno,
 	    bp->b_data, bp->b_bcount));
 
@@ -909,7 +909,7 @@ ccdiodone(struct buf *vbp)
 	    "ccdiodone: mirror component\n" : 
 	    "ccdiodone: bp %p bcount %ld resid %ld\n",
 	    bp, bp->b_bcount, bp->b_resid));
-	CCD_DPRINTF(CCDB_IO, (" dev %x(u%d), cbp %p bn %d addr %p bcnt %ld\n",
+	CCD_DPRINTF(CCDB_IO, (" dev %x(u%d), cbp %p bn %lld addr %p bcnt %ld\n",
 	    vbp->b_dev, cbp->cb_comp, cbp, vbp->b_blkno,
 	    vbp->b_data, vbp->b_bcount));
 
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index f2a63e43724..4b3f1ed2d09 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.80 2009/08/24 08:31:50 jasper Exp $	*/
+/*	$OpenBSD: fd.c,v 1.81 2009/08/24 08:51:18 jasper Exp $	*/
 /*	$NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $	*/
 
 /*-
@@ -413,7 +413,7 @@ fdstrategy(bp)
  	bp->b_cylinder = bp->b_blkno / (fd_bsize / DEV_BSIZE) / fd->sc_type->seccyl;
 
 #ifdef FD_DEBUG
-	printf("fdstrategy: b_blkno %d b_bcount %d blkno %d cylin %d sz %d\n",
+	printf("fdstrategy: b_blkno %lld b_bcount %d blkno %lld cylin %d sz %d\n",
 	    bp->b_blkno, bp->b_bcount, fd->sc_blkno, bp->b_cylinder, sz);
 #endif
 
@@ -864,7 +864,7 @@ loop:
 #ifdef FD_DEBUG
 			fdcstatus(&fd->sc_dev, 7, bp->b_flags & B_READ ?
 			    "read failed" : "write failed");
-			printf("blkno %d nblks %d\n",
+			printf("blkno %lld nblks %d\n",
 			    fd->sc_blkno, fd->sc_nblks);
 #endif
 			fdretry(fd);
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index a6f40a5d827..1e96f0d2efa 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcd.c,v 1.51 2008/11/27 22:59:52 miod Exp $ */
+/*	$OpenBSD: mcd.c,v 1.52 2009/08/24 08:51:18 jasper Exp $ */
 /*	$NetBSD: mcd.c,v 1.60 1998/01/14 12:14:41 drochner Exp $	*/
 
 /*
@@ -483,11 +483,11 @@ mcdstrategy(bp)
 	int s;
 	
 	/* Test validity. */
-	MCD_TRACE("strategy: buf=0x%lx blkno=%ld bcount=%ld\n", bp,
+	MCD_TRACE("strategy: buf=0x%lx blkno=%lld bcount=%ld\n", bp,
 	    bp->b_blkno, bp->b_bcount, 0);
 	if (bp->b_blkno < 0 ||
 	    (bp->b_bcount % sc->blksize) != 0) {
-		printf("%s: strategy: blkno = %d bcount = %ld\n",
+		printf("%s: strategy: blkno = %lld bcount = %ld\n",
 		    sc->sc_dev.dv_xname, bp->b_blkno, bp->b_bcount);
 		bp->b_error = EINVAL;
 		goto bad;
@@ -1182,7 +1182,7 @@ mcdintr(arg)
 		sc->lastmode = mbx->mode;
 
 	firstblock:
-		MCD_TRACE("doread: read blkno=%d for bp=0x%x\n", mbx->blkno,
+		MCD_TRACE("doread: read blkno=%lld for bp=0x%x\n", mbx->blkno,
 		    bp, 0, 0);
 
 		/* Build parameter block. */
@@ -1730,7 +1730,7 @@ mcd_playblocks(sc, p)
 	int error;
 
 	if (sc->debug)
-		printf("%s: playblocks: blkno %d length %d\n",
+		printf("%s: playblocks: blkno %lld length %d\n",
 		    sc->sc_dev.dv_xname, p->blk, p->len);
 
 	if (p->blk > sc->disksize || p->len > sc->disksize ||
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 14e94094cf5..1df2b5202d4 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnd.c,v 1.94 2009/08/13 15:23:11 deraadt Exp $	*/
+/*	$OpenBSD: vnd.c,v 1.95 2009/08/24 08:51:18 jasper Exp $	*/
 /*	$NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $	*/
 
 /*
@@ -547,7 +547,7 @@ vndstrategy(struct buf *bp)
 		if (resid < sz)
 			sz = resid;
 
-		DNPRINTF(VDB_IO, "vndstrategy: vp %p/%p bn %x/%x sz %x\n",
+		DNPRINTF(VDB_IO, "vndstrategy: vp %p/%p bn %x/%lld sz %x\n",
 		    vnd->sc_vp, vp, bn, nbn, sz);
 
 		s = splbio();
@@ -631,7 +631,7 @@ vndstart(struct vnd_softc *vnd)
 	vnd->sc_tab.b_actf = bp->b_actf;
 
 	DNPRINTF(VDB_IO,
-	    "vndstart(%d): bp %p vp %p blkno %x addr %p cnt %lx\n",
+	    "vndstart(%d): bp %p vp %p blkno %lld addr %p cnt %lx\n",
 	    vnd-vnd_softc, bp, bp->b_vp, bp->b_blkno, bp->b_data,
 	    bp->b_bcount);
 
@@ -653,7 +653,7 @@ vndiodone(struct buf *bp)
 	splassert(IPL_BIO);
 
 	DNPRINTF(VDB_IO,
-	    "vndiodone(%d): vbp %p vp %p blkno %x addr %p cnt %lx\n",
+	    "vndiodone(%d): vbp %p vp %p blkno %lld addr %p cnt %lx\n",
 	    vnd-vnd_softc, vbp, vbp->vb_buf.b_vp, vbp->vb_buf.b_blkno,
 	    vbp->vb_buf.b_data, vbp->vb_buf.b_bcount);