From f368af933db0c9eda348b8b1c43914f6d85ac899 Mon Sep 17 00:00:00 2001
From: Maxime Henrion <mux@FreeBSD.org>
Date: Fri, 13 Sep 2002 09:16:06 +0000
Subject: [PATCH] Fix a printf() format error on 64 bits architectures. Also
 fix some style bugs on the same line.

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

diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 415c0eb4b3f..2ce6ce2a2eb 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -97,6 +97,7 @@
 #include <sys/namei.h>
 #include <sys/conf.h>
 #include <sys/stat.h>
+#include <sys/stdint.h>
 #include <sys/sysctl.h>
 #include <sys/disk.h>
 #include <sys/devicestat.h>
@@ -1176,9 +1177,9 @@ ccdiodone(struct bio *ibp)
 			bp->bio_error = cbp->cb_buf.bio_error ? 
 			    cbp->cb_buf.bio_error : EIO;
 		}
-		printf("ccd%d: error %d on component %d block %d (ccd block %lld)%s\n",
-		       unit, bp->bio_error, cbp->cb_comp, 
-		       (int)cbp->cb_buf.bio_blkno, bp->bio_blkno, msg);
+		printf("ccd%d: error %d on component %d block %d "
+		    "(ccd block %jd)%s\n", unit, bp->bio_error, cbp->cb_comp, 
+		    (int)cbp->cb_buf.bio_blkno, (intmax_t)bp->bio_blkno, msg);
 	}
 
 	/*
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index 415c0eb4b3f..2ce6ce2a2eb 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -97,6 +97,7 @@
 #include <sys/namei.h>
 #include <sys/conf.h>
 #include <sys/stat.h>
+#include <sys/stdint.h>
 #include <sys/sysctl.h>
 #include <sys/disk.h>
 #include <sys/devicestat.h>
@@ -1176,9 +1177,9 @@ ccdiodone(struct bio *ibp)
 			bp->bio_error = cbp->cb_buf.bio_error ? 
 			    cbp->cb_buf.bio_error : EIO;
 		}
-		printf("ccd%d: error %d on component %d block %d (ccd block %lld)%s\n",
-		       unit, bp->bio_error, cbp->cb_comp, 
-		       (int)cbp->cb_buf.bio_blkno, bp->bio_blkno, msg);
+		printf("ccd%d: error %d on component %d block %d "
+		    "(ccd block %jd)%s\n", unit, bp->bio_error, cbp->cb_comp, 
+		    (int)cbp->cb_buf.bio_blkno, (intmax_t)bp->bio_blkno, msg);
 	}
 
 	/*