Fixed printf format errors.

2 files changed, 13 insertions, 12 deletions

diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 7793446..99fc02f 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -38,7 +38,7 @@ static volatile int ttyverbose = 0;
  * SUCH DAMAGE.
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
- * $Id: tty.c,v 1.103 1998/05/17 20:08:05 bde Exp $
+ * $Id: tty.c,v 1.104 1998/06/07 17:11:41 dfr Exp $
  */
 
 /*-
@@ -2234,25 +2234,25 @@ ttyinfo(tp)
 		calcru(pick, &utime, &stime, NULL);
 
 		/* Print user time. */
-		ttyprintf(tp, "%d.%02du ",
+		ttyprintf(tp, "%ld.%02ldu ",
 		    utime.tv_sec, utime.tv_usec / 10000);
 
 		/* Print system time. */
-		ttyprintf(tp, "%d.%02ds ",
+		ttyprintf(tp, "%ld.%02lds ",
 		    stime.tv_sec, stime.tv_usec / 10000);
 
 #define	pgtok(a)	(((a) * PAGE_SIZE) / 1024)
 		/* Print percentage cpu, resident set size. */
 		tmp = (pick->p_pctcpu * 10000 + FSCALE / 2) >> FSHIFT;
-		ttyprintf(tp, "%d%% %dk\n",
+		ttyprintf(tp, "%d%% %ldk\n",
 		    tmp / 100,
 		    pick->p_stat == SIDL || pick->p_stat == SZOMB ? 0 :
 #ifdef pmap_resident_count
-			pgtok(pmap_resident_count(&pick->p_vmspace->vm_pmap))
+		    (long)pgtok(pmap_resident_count(&pick->p_vmspace->vm_pmap))
 #else
-			pgtok(pick->p_vmspace->vm_rssize)
+		    (long)pgtok(pick->p_vmspace->vm_rssize)
 #endif
-			);
+		    );
 	}
 	tp->t_rocount = 0;	/* so pending input will be retyped if BS */
 }
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 1d06f8b..3ea15a4 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cluster.c	8.7 (Berkeley) 2/13/94
- * $Id: vfs_cluster.c,v 1.63 1998/07/04 20:45:32 julian Exp $
+ * $Id: vfs_cluster.c,v 1.64 1998/07/07 04:36:23 bde Exp $
  */
 
 #include "opt_debug_cluster.h"
@@ -437,8 +437,8 @@ cluster_rbuild(vp, filesize, lbn, blkno, size, run, fbp)
 			bp->b_pages[j] = bogus_page;
 	}
 	if (bp->b_bufsize > bp->b_kvasize)
-		panic("cluster_rbuild: b_bufsize(%d) > b_kvasize(%d)\n",
-			bp->b_bufsize, bp->b_kvasize);
+		panic("cluster_rbuild: b_bufsize(%ld) > b_kvasize(%d)\n",
+		    bp->b_bufsize, bp->b_kvasize);
 	bp->b_kvasize = bp->b_bufsize;
 
 	pmap_qenter(trunc_page((vm_offset_t) bp->b_data),
@@ -806,8 +806,9 @@ cluster_wbuild(vp, size, start_lbn, len)
 		pmap_qenter(trunc_page((vm_offset_t) bp->b_data),
 			(vm_page_t *) bp->b_pages, bp->b_npages);
 		if (bp->b_bufsize > bp->b_kvasize)
-			panic("cluster_wbuild: b_bufsize(%d) > b_kvasize(%d)\n",
-				bp->b_bufsize, bp->b_kvasize);
+			panic(
+			    "cluster_wbuild: b_bufsize(%ld) > b_kvasize(%d)\n",
+			    bp->b_bufsize, bp->b_kvasize);
 		bp->b_kvasize = bp->b_bufsize;
 		totalwritten += bp->b_bufsize;
 		bp->b_dirtyoff = 0;