Fixed printf format errors.

9 files changed, 40 insertions, 31 deletions

diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index a01e9ae2020a..758addeb1625 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -39,7 +39,7 @@ static volatile int print_tci = 1;
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.75 1998/07/04 19:12:21 phk Exp $
+ * $Id: kern_clock.c,v 1.76 1998/07/04 19:29:15 phk Exp $
  */
 
 #include <sys/param.h>
@@ -692,7 +692,7 @@ init_timecounter(struct timecounter *tc)
 	tc->tc_cost >>= 8;
 	if (print_tci && strcmp(tc->tc_name, "dummy"))
 		printf("Timecounter \"%s\"  frequency %lu Hz  cost %u ns\n", 
-		    tc->tc_name, tc->tc_frequency, tc->tc_cost);
+		    tc->tc_name, (u_long)tc->tc_frequency, tc->tc_cost);
 
 	/* XXX: For now always start using the counter. */
 	tc->tc_offset_count = tc->tc_get_timecount(tc);
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c
index b0fe29a5f706..0a752bbf1442 100644
--- a/sys/kern/kern_module.c
+++ b/sys/kern/kern_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_module.c,v 1.5 1997/11/06 19:29:11 phk Exp $
+ *	$Id: kern_module.c,v 1.6 1997/11/07 08:52:56 phk Exp $
  */
 
 #include <sys/param.h>
@@ -81,9 +81,10 @@ module_register_init(void *arg)
     moduledata_t* data = (moduledata_t*) arg;
     int error;
 
+#define	fptrint_t	unsigned	/* XXX */
     if (error = module_register(data->name, data->evhand, data->priv))
-	printf("module_register_init: module_register(%s, %x, %x) returned %d",
-	       data->name, data->evhand, data->priv, error);
+	printf("module_register_init: module_register(%s, %lx, %p) returned %d",
+	       data->name, (u_long)(fptrint_t)data->evhand, data->priv, error);
 }
 
 int
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 197c4dd9cea6..e229a5d4cd4e 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_proc.c	8.7 (Berkeley) 2/14/95
- * $Id: kern_proc.c,v 1.35 1998/02/09 06:09:23 eivind Exp $
+ * $Id: kern_proc.c,v 1.36 1998/02/20 13:52:14 bde Exp $
  */
 
 #include <sys/param.h>
@@ -375,14 +375,17 @@ DB_SHOW_COMMAND(pgrpdump, pgrpdump)
 		if (pgrp = pgrphashtbl[i].lh_first) {
 			printf("\tindx %d\n", i);
 			for (; pgrp != 0; pgrp = pgrp->pg_hash.le_next) {
-				printf("\tpgrp %x, pgid %d, sess %x, sesscnt %d, mem %x\n",
-				    pgrp, pgrp->pg_id, pgrp->pg_session,
+				printf(
+			"\tpgrp %p, pgid %ld, sess %p, sesscnt %d, mem %p\n",
+				    (void *)pgrp, (long)pgrp->pg_id,
+				    (void *)pgrp->pg_session,
 				    pgrp->pg_session->s_count,
-				    pgrp->pg_members.lh_first);
+				    (void *)pgrp->pg_members.lh_first);
 				for (p = pgrp->pg_members.lh_first; p != 0;
 				    p = p->p_pglist.le_next) {
-					printf("\t\tpid %d addr %x pgrp %x\n", 
-					    p->p_pid, p, p->p_pgrp);
+					printf("\t\tpid %ld addr %p pgrp %p\n", 
+					    (long)p->p_pid, (void *)p,
+					    (void *)p->p_pgrp);
 				}
 			}
 		}
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index e65453f43819..bf4bd3325fbb 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_shutdown.c	8.3 (Berkeley) 1/21/94
- * $Id: kern_shutdown.c,v 1.32 1998/05/17 22:12:13 tegge Exp $
+ * $Id: kern_shutdown.c,v 1.33 1998/06/07 17:11:35 dfr Exp $
  */
 
 #include "opt_ddb.h"
@@ -235,7 +235,11 @@ boot(howto)
 			for (bp = &buf[nbuf]; --bp >= buf; ) {
 				if ((bp->b_flags & (B_BUSY | B_INVAL)) == B_BUSY) {
 					nbusy++;
-					printf("%d: dev:%08x, flags:%08x, blkno:%d, lblkno:%d\n", nbusy, bp->b_dev, bp->b_flags, bp->b_blkno, bp->b_lblkno);
+					printf(
+			"%d: dev:%08lx, flags:%08lx, blkno:%ld, lblkno:%ld\n",
+					    nbusy, (u_long)bp->b_dev,
+					    bp->b_flags, (long)bp->b_blkno,
+					    (long)bp->b_lblkno);
 				}
 			}
 			DELAY(5000000);	/* 5 seconds */
@@ -357,7 +361,7 @@ dumpsys(void)
 	if (!(bdevsw[major(dumpdev)]->d_dump))
 		return;
 	dumpsize = Maxmem;
-	printf("\ndumping to dev %lx, offset %ld\n", dumpdev, dumplo);
+	printf("\ndumping to dev %lx, offset %ld\n", (u_long)dumpdev, dumplo);
 	printf("dump ");
 	switch ((*bdevsw[major(dumpdev)]->d_dump)(dumpdev)) {
 
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index a01e9ae2020a..758addeb1625 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -39,7 +39,7 @@ static volatile int print_tci = 1;
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.75 1998/07/04 19:12:21 phk Exp $
+ * $Id: kern_clock.c,v 1.76 1998/07/04 19:29:15 phk Exp $
  */
 
 #include <sys/param.h>
@@ -692,7 +692,7 @@ init_timecounter(struct timecounter *tc)
 	tc->tc_cost >>= 8;
 	if (print_tci && strcmp(tc->tc_name, "dummy"))
 		printf("Timecounter \"%s\"  frequency %lu Hz  cost %u ns\n", 
-		    tc->tc_name, tc->tc_frequency, tc->tc_cost);
+		    tc->tc_name, (u_long)tc->tc_frequency, tc->tc_cost);
 
 	/* XXX: For now always start using the counter. */
 	tc->tc_offset_count = tc->tc_get_timecount(tc);
diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c
index 95e89d06bc9c..6c788a60eada 100644
--- a/sys/kern/subr_diskmbr.c
+++ b/sys/kern/subr_diskmbr.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: diskslice_machdep.c,v 1.26 1997/09/27 15:34:34 joerg Exp $
+ *	$Id: diskslice_machdep.c,v 1.27 1997/12/02 21:06:20 phk Exp $
  */
 
 #include <stddef.h>
@@ -137,8 +137,8 @@ check_part(sname, dp, offset, nsectors, ntracks, mbr_offset )
 	error = (ssector == ssector1 && esector == esector1) ? 0 : EINVAL;
 	if (bootverbose)
 		printf("%s: type 0x%x, start %lu, end = %lu, size %lu %s\n",
-		       sname, dp->dp_typ, ssector1, esector1, dp->dp_size,
-		       error ? "" : ": OK");
+		       sname, dp->dp_typ, ssector1, esector1,
+		       (u_long)dp->dp_size, error ? "" : ": OK");
 	if (ssector != ssector1 && bootverbose)
 		printf("%s: C/H/S start %d/%d/%d (%lu) != start %lu: invalid\n",
 		       sname, chs_scyl, dp->dp_shd, chs_ssect,
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 9cb7ee2d1af7..db12d1daada0 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -46,7 +46,7 @@
  *	from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: subr_diskslice.c,v 1.46 1998/06/06 03:06:55 bde Exp $
+ *	$Id: subr_diskslice.c,v 1.47 1998/07/04 22:30:22 julian Exp $
  */
 
 #include "opt_devfs.h"
@@ -146,8 +146,8 @@ if (labelsect != 0) Debugger("labelsect != 0 in dscheck()");
 
 			newblkno = transbad144(sp->ds_bad, blkno);
 			if (newblkno != blkno)
-				printf("should map bad block %lu -> %lu\n",
-				       blkno, newblkno);
+				printf("should map bad block %ld -> %ld\n",
+				       (long)blkno, (long)newblkno);
 		}
 	}
 
@@ -958,7 +958,8 @@ partition_info(sname, part, pp)
 	struct partition *pp;
 {
 	printf("%s%c: start %lu, end %lu, size %lu\n", sname, 'a' + part,
-	       pp->p_offset, pp->p_offset + pp->p_size - 1, pp->p_size);
+	       (u_long)pp->p_offset, (u_long)(pp->p_offset + pp->p_size - 1),
+	       (u_long)pp->p_size);
 }
 
 static void
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 29518f090f95..39a261310c38 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.156 1998/06/10 22:02:14 julian Exp $
+ * $Id: vfs_subr.c,v 1.157 1998/06/21 18:02:43 bde Exp $
  */
 
 /*
@@ -1901,10 +1901,10 @@ vprint(label, vp)
 	char buf[64];
 
 	if (label != NULL)
-		printf("%s: %x: ", label, vp);
+		printf("%s: %p: ", label, (void *)vp);
 	else
-		printf("%x: ", vp);
-	printf("type %s, usecount %d, writecount %d, refcount %ld,",
+		printf("%p: ", (void *)vp);
+	printf("type %s, usecount %d, writecount %d, refcount %d,",
 	    typename[vp->v_type], vp->v_usecount, vp->v_writecount,
 	    vp->v_holdcnt);
 	buf[0] = '\0';
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 29518f090f95..39a261310c38 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.156 1998/06/10 22:02:14 julian Exp $
+ * $Id: vfs_subr.c,v 1.157 1998/06/21 18:02:43 bde Exp $
  */
 
 /*
@@ -1901,10 +1901,10 @@ vprint(label, vp)
 	char buf[64];
 
 	if (label != NULL)
-		printf("%s: %x: ", label, vp);
+		printf("%s: %p: ", label, (void *)vp);
 	else
-		printf("%x: ", vp);
-	printf("type %s, usecount %d, writecount %d, refcount %ld,",
+		printf("%p: ", (void *)vp);
+	printf("type %s, usecount %d, writecount %d, refcount %d,",
 	    typename[vp->v_type], vp->v_usecount, vp->v_writecount,
 	    vp->v_holdcnt);
 	buf[0] = '\0';