d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed printf format errors.

Browse Source
This commit is contained in:
Bruce Evans 1998-07-11 10:45:45 +00:00
parent ed62fb52ec
commit 2f18a2801b
2 changed files with 13 additions and 12 deletions

12
sys/kern/tty.c

@ -38,7 +38,7 @@ static volatile int ttyverbose = 0;
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)tty.c 8.8 (Berkeley) 1/21/94 * @(#)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,23 +2234,23 @@ ttyinfo(tp)
calcru(pick, &utime, &stime, NULL); calcru(pick, &utime, &stime, NULL);
/* Print user time. */ /* Print user time. */
ttyprintf(tp, "%d.%02du ", ttyprintf(tp, "%ld.%02ldu ",
utime.tv_sec, utime.tv_usec / 10000); utime.tv_sec, utime.tv_usec / 10000);
/* Print system time. */ /* Print system time. */
ttyprintf(tp, "%d.%02ds ", ttyprintf(tp, "%ld.%02lds ",
stime.tv_sec, stime.tv_usec / 10000); stime.tv_sec, stime.tv_usec / 10000);
#define pgtok(a) (((a) * PAGE_SIZE) / 1024) #define pgtok(a) (((a) * PAGE_SIZE) / 1024)
/* Print percentage cpu, resident set size. */ /* Print percentage cpu, resident set size. */
tmp = (pick->p_pctcpu * 10000 + FSCALE / 2) >> FSHIFT; tmp = (pick->p_pctcpu * 10000 + FSCALE / 2) >> FSHIFT;
ttyprintf(tp, "%d%% %dk\n", ttyprintf(tp, "%d%% %ldk\n",
tmp / 100, tmp / 100,
pick->p_stat == SIDL || pick->p_stat == SZOMB ? 0 : pick->p_stat == SIDL || pick->p_stat == SZOMB ? 0 :
#ifdef pmap_resident_count #ifdef pmap_resident_count
pgtok(pmap_resident_count(&pick->p_vmspace->vm_pmap)) (long)pgtok(pmap_resident_count(&pick->p_vmspace->vm_pmap))
#else #else
pgtok(pick->p_vmspace->vm_rssize) (long)pgtok(pick->p_vmspace->vm_rssize)
#endif #endif
); );
} }

7
sys/kern/vfs_cluster.c

@ -33,7 +33,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)vfs_cluster.c 8.7 (Berkeley) 2/13/94 * @(#)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" #include "opt_debug_cluster.h"
@ -437,7 +437,7 @@ cluster_rbuild(vp, filesize, lbn, blkno, size, run, fbp)
bp->b_pages[j] = bogus_page; bp->b_pages[j] = bogus_page;
} }
if (bp->b_bufsize > bp->b_kvasize) if (bp->b_bufsize > bp->b_kvasize)
panic("cluster_rbuild: b_bufsize(%d) > b_kvasize(%d)\n", panic("cluster_rbuild: b_bufsize(%ld) > b_kvasize(%d)\n",
bp->b_bufsize, bp->b_kvasize); bp->b_bufsize, bp->b_kvasize);
bp->b_kvasize = bp->b_bufsize; bp->b_kvasize = bp->b_bufsize;
@ -806,7 +806,8 @@ cluster_wbuild(vp, size, start_lbn, len)
pmap_qenter(trunc_page((vm_offset_t) bp->b_data), pmap_qenter(trunc_page((vm_offset_t) bp->b_data),
(vm_page_t *) bp->b_pages, bp->b_npages); (vm_page_t *) bp->b_pages, bp->b_npages);
if (bp->b_bufsize > bp->b_kvasize) if (bp->b_bufsize > bp->b_kvasize)
panic("cluster_wbuild: b_bufsize(%d) > b_kvasize(%d)\n", panic(
"cluster_wbuild: b_bufsize(%ld) > b_kvasize(%d)\n",
bp->b_bufsize, bp->b_kvasize); bp->b_bufsize, bp->b_kvasize);
bp->b_kvasize = bp->b_bufsize; bp->b_kvasize = bp->b_bufsize;
totalwritten += bp->b_bufsize; totalwritten += bp->b_bufsize;