diff options
author | bde <bde@FreeBSD.org> | 1998-07-11 07:46:16 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1998-07-11 07:46:16 +0000 |
commit | f0b863f4b5c8604ff238621b7fcd6becea496675 (patch) | |
tree | 204ad88277d5159445cec0b7fbc88090454d53eb /sys/ufs | |
parent | 065e3edb4989d6adb56bfc42cab8726f680cef5b (diff) | |
download | FreeBSD-src-f0b863f4b5c8604ff238621b7fcd6becea496675.zip FreeBSD-src-f0b863f4b5c8604ff238621b7fcd6becea496675.tar.gz |
Fixed printf format errors.
Diffstat (limited to 'sys/ufs')
-rw-r--r-- | sys/ufs/ffs/ffs_alloc.c | 40 | ||||
-rw-r--r-- | sys/ufs/mfs/mfs_vnops.c | 6 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_lookup.c | 6 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_vnops.c | 7 |
4 files changed, 31 insertions, 28 deletions
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index f0e69b6..109c97f 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_alloc.c 8.18 (Berkeley) 5/26/95 - * $Id: ffs_alloc.c,v 1.48 1998/03/08 09:58:42 julian Exp $ + * $Id: ffs_alloc.c,v 1.49 1998/03/30 09:55:50 phk Exp $ */ #include "opt_quota.h" @@ -116,7 +116,7 @@ ffs_alloc(ip, lbn, bpref, size, cred, bnp) #ifdef DIAGNOSTIC if ((u_int)size > fs->fs_bsize || fragoff(fs, size) != 0) { printf("dev = 0x%lx, bsize = %ld, size = %d, fs = %s\n", - (u_long)ip->i_dev, fs->fs_bsize, size, fs->fs_fsmnt); + (u_long)ip->i_dev, (long)fs->fs_bsize, size, fs->fs_fsmnt); panic("ffs_alloc: bad size"); } if (cred == NOCRED) @@ -186,9 +186,8 @@ ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp) if ((u_int)osize > fs->fs_bsize || fragoff(fs, osize) != 0 || (u_int)nsize > fs->fs_bsize || fragoff(fs, nsize) != 0) { printf( - "dev = 0x%lx, bsize = %ld, osize = %d, " - "nsize = %d, fs = %s\n", - (u_long)ip->i_dev, fs->fs_bsize, osize, + "dev = 0x%lx, bsize = %ld, osize = %d, nsize = %d, fs = %s\n", + (u_long)ip->i_dev, (long)fs->fs_bsize, osize, nsize, fs->fs_fsmnt); panic("ffs_realloccg: bad size"); } @@ -200,7 +199,8 @@ ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp) goto nospace; if ((bprev = ip->i_db[lbprev]) == 0) { printf("dev = 0x%lx, bsize = %ld, bprev = %ld, fs = %s\n", - (u_long) ip->i_dev, fs->fs_bsize, bprev, fs->fs_fsmnt); + (u_long)ip->i_dev, (long)fs->fs_bsize, (long)bprev, + fs->fs_fsmnt); panic("ffs_realloccg: bad bprev"); } /* @@ -285,7 +285,7 @@ ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp) break; default: printf("dev = 0x%lx, optim = %ld, fs = %s\n", - (u_long)ip->i_dev, fs->fs_optim, fs->fs_fsmnt); + (u_long)ip->i_dev, (long)fs->fs_optim, fs->fs_fsmnt); panic("ffs_realloccg: bad optim"); /* NOTREACHED */ } @@ -605,13 +605,13 @@ ffs_valloc(pvp, mode, cred, vpp) } ip = VTOI(*vpp); if (ip->i_mode) { - printf("mode = 0%o, inum = %ld, fs = %s\n", - ip->i_mode, ip->i_number, fs->fs_fsmnt); + printf("mode = 0%o, inum = %lu, fs = %s\n", + ip->i_mode, (u_long)ip->i_number, fs->fs_fsmnt); panic("ffs_valloc: dup alloc"); } if (ip->i_blocks) { /* XXX */ - printf("free inode %s/%ld had %ld blocks\n", - fs->fs_fsmnt, ino, ip->i_blocks); + printf("free inode %s/%lu had %ld blocks\n", + fs->fs_fsmnt, (u_long)ino, (long)ip->i_blocks); ip->i_blocks = 0; } ip->i_flags = 0; @@ -1245,7 +1245,7 @@ ffs_nodealloccg(ip, cg, ipref, mode) loc = skpc(0xff, len, &cg_inosused(cgp)[0]); if (loc == 0) { printf("cg = %d, irotor = %ld, fs = %s\n", - cg, cgp->cg_irotor, fs->fs_fsmnt); + cg, (long)cgp->cg_irotor, fs->fs_fsmnt); panic("ffs_nodealloccg: map corrupted"); /* NOTREACHED */ } @@ -1307,7 +1307,8 @@ ffs_blkfree(ip, bno, size) } cg = dtog(fs, bno); if ((u_int)bno >= fs->fs_size) { - printf("bad block %ld, ino %ld\n", bno, ip->i_number); + printf("bad block %ld, ino %lu\n", + (long)bno, (u_long)ip->i_number); ffs_fserr(fs, ip->i_uid, "bad block"); return; } @@ -1328,7 +1329,7 @@ ffs_blkfree(ip, bno, size) blkno = fragstoblks(fs, bno); if (!ffs_isfreeblock(fs, cg_blksfree(cgp), blkno)) { printf("dev = 0x%lx, block = %ld, fs = %s\n", - (u_long) ip->i_dev, bno, fs->fs_fsmnt); + (u_long)ip->i_dev, (long)bno, fs->fs_fsmnt); panic("ffs_blkfree: freeing free block"); } ffs_setblock(fs, cg_blksfree(cgp), blkno); @@ -1353,7 +1354,8 @@ ffs_blkfree(ip, bno, size) for (i = 0; i < frags; i++) { if (isset(cg_blksfree(cgp), bno + i)) { printf("dev = 0x%lx, block = %ld, fs = %s\n", - (u_long) ip->i_dev, bno + i, fs->fs_fsmnt); + (u_long)ip->i_dev, (long)(bno + i), + fs->fs_fsmnt); panic("ffs_blkfree: freeing free frag"); } setbit(cg_blksfree(cgp), bno + i); @@ -1405,8 +1407,8 @@ ffs_checkblk(ip, bno, size) fs = ip->i_fs; if ((u_int)size > fs->fs_bsize || fragoff(fs, size) != 0) { - printf("bsize = %d, size = %d, fs = %s\n", - fs->fs_bsize, size, fs->fs_fsmnt); + printf("bsize = %ld, size = %ld, fs = %s\n", + (long)fs->fs_bsize, size, fs->fs_fsmnt); panic("ffs_checkblk: bad size"); } if ((u_int)bno >= fs->fs_size) @@ -1486,8 +1488,8 @@ ffs_vfree( pvp, ino, mode) cgp->cg_time = time_second; ino %= fs->fs_ipg; if (isclr(cg_inosused(cgp), ino)) { - printf("dev = 0x%lx, ino = %ld, fs = %s\n", - (u_long)pip->i_dev, ino, fs->fs_fsmnt); + printf("dev = 0x%lx, ino = %lu, fs = %s\n", + (u_long)pip->i_dev, (u_long)ino, fs->fs_fsmnt); if (fs->fs_ronly == 0) panic("ffs_vfree: freeing free inode"); } diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c index 3d64dc2..ea4298d 100644 --- a/sys/ufs/mfs/mfs_vnops.c +++ b/sys/ufs/mfs/mfs_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfs_vnops.c 8.11 (Berkeley) 5/22/95 - * $Id: mfs_vnops.c,v 1.35 1998/02/16 23:55:53 msmith Exp $ + * $Id: mfs_vnops.c,v 1.36 1998/07/04 20:45:39 julian Exp $ */ #include <sys/param.h> @@ -295,8 +295,8 @@ mfs_print(ap) { register struct mfsnode *mfsp = VTOMFS(ap->a_vp); - printf("tag VT_MFS, pid %ld, base %p, size %ld\n", mfsp->mfs_pid, - mfsp->mfs_baseoff, mfsp->mfs_size); + printf("tag VT_MFS, pid %ld, base %p, size %ld\n", + (long)mfsp->mfs_pid, (void *)mfsp->mfs_baseoff, mfsp->mfs_size); return (0); } diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c index f168410..936be19 100644 --- a/sys/ufs/ufs/ufs_lookup.c +++ b/sys/ufs/ufs/ufs_lookup.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_lookup.c 8.15 (Berkeley) 6/16/95 - * $Id: ufs_lookup.c,v 1.23 1998/03/30 09:56:23 phk Exp $ + * $Id: ufs_lookup.c,v 1.24 1998/04/15 12:27:31 bde Exp $ */ #include <sys/param.h> @@ -560,8 +560,8 @@ ufs_dirbad(ip, offset, how) struct mount *mp; mp = ITOV(ip)->v_mount; - (void)printf("%s: bad dir ino %ld at offset %ld: %s\n", - mp->mnt_stat.f_mntonname, ip->i_number, offset, how); + (void)printf("%s: bad dir ino %lu at offset %ld: %s\n", + mp->mnt_stat.f_mntonname, (u_long)ip->i_number, (long)offset, how); if ((mp->mnt_stat.f_flags & MNT_RDONLY) == 0) panic("ufs_dirbad: bad dir"); } diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 423d19d..b8948c6 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95 - * $Id: ufs_vnops.c,v 1.94 1998/07/04 20:45:40 julian Exp $ + * $Id: ufs_vnops.c,v 1.95 1998/07/10 00:10:20 julian Exp $ */ #include "opt_quota.h" @@ -1783,8 +1783,9 @@ ufs_print(ap) register struct vnode *vp = ap->a_vp; register struct inode *ip = VTOI(vp); - printf("tag VT_UFS, ino %ld, on dev %x (%d, %d)", ip->i_number, - ip->i_dev, major(ip->i_dev), minor(ip->i_dev)); + printf("tag VT_UFS, ino %lu, on dev %#lx (%d, %d)", + (u_long)ip->i_number, (u_long)ip->i_dev, major(ip->i_dev), + minor(ip->i_dev)); if (vp->v_type == VFIFO) fifo_printinfo(vp); lockmgr_printinfo(&ip->i_lock); |