From 2dfbcdd46df587ab305ecb0117b99a38d3feaeac Mon Sep 17 00:00:00 2001
From: Maxime Henrion <mux@FreeBSD.org>
Date: Fri, 13 Sep 2002 09:37:44 +0000
Subject: [PATCH] Fix another two printf() format errors which weren't warned
 about because the bio_blknos were bogusly casted to long long.

---
 sys/dev/ccd/ccd.c   | 8 ++++----
 sys/geom/geom_ccd.c | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 519ea986ceb..b4387d97e96 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -1082,9 +1082,9 @@ ccdbuffer(struct ccdbuf **cb, struct ccd_s *cs, struct bio *bp, daddr_t bn, cadd
 
 #ifdef DEBUG
 	if (ccddebug & CCDB_IO)
-		printf(" dev %p(u%ld): cbp %p bn %lld addr %p bcnt %ld\n",
+		printf(" dev %p(u%ld): cbp %p bn %jd addr %p bcnt %ld\n",
 		       ci->ci_dev, (unsigned long)(ci-cs->sc_cinfo), cbp, 
-		       (long long)cbp->cb_buf.bio_blkno, cbp->cb_buf.bio_data, 
+		       (intmax_t)cbp->cb_buf.bio_blkno, cbp->cb_buf.bio_data, 
 		       cbp->cb_buf.bio_bcount);
 #endif
 	cb[0] = cbp;
@@ -1142,9 +1142,9 @@ ccdiodone(struct bio *ibp)
 	if (ccddebug & CCDB_IO) {
 		printf("ccdiodone: bp %p bcount %ld resid %ld\n",
 		       bp, bp->bio_bcount, bp->bio_resid);
-		printf(" dev %p(u%d), cbp %p bn %lld addr %p bcnt %ld\n",
+		printf(" dev %p(u%d), cbp %p bn %jd addr %p bcnt %ld\n",
 		       cbp->cb_buf.bio_dev, cbp->cb_comp, cbp,
-		       (long long)cbp->cb_buf.bio_blkno, cbp->cb_buf.bio_data,
+		       (intmax_t)cbp->cb_buf.bio_blkno, cbp->cb_buf.bio_data,
 		       cbp->cb_buf.bio_bcount);
 	}
 #endif
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index 519ea986ceb..b4387d97e96 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -1082,9 +1082,9 @@ ccdbuffer(struct ccdbuf **cb, struct ccd_s *cs, struct bio *bp, daddr_t bn, cadd
 
 #ifdef DEBUG
 	if (ccddebug & CCDB_IO)
-		printf(" dev %p(u%ld): cbp %p bn %lld addr %p bcnt %ld\n",
+		printf(" dev %p(u%ld): cbp %p bn %jd addr %p bcnt %ld\n",
 		       ci->ci_dev, (unsigned long)(ci-cs->sc_cinfo), cbp, 
-		       (long long)cbp->cb_buf.bio_blkno, cbp->cb_buf.bio_data, 
+		       (intmax_t)cbp->cb_buf.bio_blkno, cbp->cb_buf.bio_data, 
 		       cbp->cb_buf.bio_bcount);
 #endif
 	cb[0] = cbp;
@@ -1142,9 +1142,9 @@ ccdiodone(struct bio *ibp)
 	if (ccddebug & CCDB_IO) {
 		printf("ccdiodone: bp %p bcount %ld resid %ld\n",
 		       bp, bp->bio_bcount, bp->bio_resid);
-		printf(" dev %p(u%d), cbp %p bn %lld addr %p bcnt %ld\n",
+		printf(" dev %p(u%d), cbp %p bn %jd addr %p bcnt %ld\n",
 		       cbp->cb_buf.bio_dev, cbp->cb_comp, cbp,
-		       (long long)cbp->cb_buf.bio_blkno, cbp->cb_buf.bio_data,
+		       (intmax_t)cbp->cb_buf.bio_blkno, cbp->cb_buf.bio_data,
 		       cbp->cb_buf.bio_bcount);
 	}
 #endif