From 3fd23f5c090435fe31ce4e384720abbac38cf031 Mon Sep 17 00:00:00 2001 From: Bill Joy Date: Tue, 19 Oct 1982 18:32:46 -0800 Subject: [PATCH] more lint SCCS-vsn: sys/kern/kern_resource.c 4.17 SCCS-vsn: sys/kern/sys_generic.c 5.19 SCCS-vsn: sys/ufs/ffs/ffs_alloc.c 2.17 SCCS-vsn: sys/ufs/lfs/lfs_alloc.c 2.17 SCCS-vsn: sys/ufs/ffs/ffs_inode.c 4.29 SCCS-vsn: sys/ufs/ffs/ufs_inode.c 4.29 SCCS-vsn: sys/ufs/lfs/lfs_inode.c 4.29 SCCS-vsn: sys/ufs/ufs/ufs_inode.c 4.29 SCCS-vsn: sys/kern/vfs_lookup.c 4.28 SCCS-vsn: sys/ufs/ffs/ufs_lookup.c 4.28 SCCS-vsn: sys/ufs/ufs/ufs_lookup.c 4.28 SCCS-vsn: sys/kern/vfs_syscalls.c 4.41 SCCS-vsn: sys/ufs/ffs/ffs_vnops.c 4.41 SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 4.41 SCCS-vsn: sys/ufs/lfs/lfs_vnops.c 4.41 SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 4.41 --- usr/src/sys/kern/kern_resource.c | 4 ++-- usr/src/sys/kern/sys_generic.c | 6 +++--- usr/src/sys/kern/vfs_lookup.c | 8 ++++---- usr/src/sys/kern/vfs_syscalls.c | 10 +++++----- usr/src/sys/ufs/ffs/ffs_alloc.c | 4 ++-- usr/src/sys/ufs/ffs/ffs_inode.c | 9 +++------ usr/src/sys/ufs/ffs/ffs_vnops.c | 10 +++++----- usr/src/sys/ufs/ffs/ufs_inode.c | 9 +++------ usr/src/sys/ufs/ffs/ufs_lookup.c | 8 ++++---- usr/src/sys/ufs/ffs/ufs_vnops.c | 10 +++++----- usr/src/sys/ufs/lfs/lfs_alloc.c | 4 ++-- usr/src/sys/ufs/lfs/lfs_inode.c | 9 +++------ usr/src/sys/ufs/lfs/lfs_vnops.c | 10 +++++----- usr/src/sys/ufs/ufs/ufs_inode.c | 9 +++------ usr/src/sys/ufs/ufs/ufs_lookup.c | 8 ++++---- usr/src/sys/ufs/ufs/ufs_vnops.c | 10 +++++----- 16 files changed, 58 insertions(+), 70 deletions(-) diff --git a/usr/src/sys/kern/kern_resource.c b/usr/src/sys/kern/kern_resource.c index eb5af6c086..94901d0d26 100644 --- a/usr/src/sys/kern/kern_resource.c +++ b/usr/src/sys/kern/kern_resource.c @@ -1,4 +1,4 @@ -/* kern_resource.c 4.16 82/10/17 */ +/* kern_resource.c 4.17 82/10/19 */ #include "../h/param.h" #include "../h/systm.h" @@ -230,7 +230,7 @@ getrusage() ruadd(ru, ru2) register struct rusage *ru, *ru2; { - register u_int *ip, *ip2; + register long *ip, *ip2; register int i; timevaladd(&ru->ru_utime, &ru2->ru_utime); diff --git a/usr/src/sys/kern/sys_generic.c b/usr/src/sys/kern/sys_generic.c index 987754cdd0..f55f22bf4b 100644 --- a/usr/src/sys/kern/sys_generic.c +++ b/usr/src/sys/kern/sys_generic.c @@ -1,4 +1,4 @@ -/* sys_generic.c 5.18 82/10/17 */ +/* sys_generic.c 5.19 82/10/19 */ #include "../h/param.h" #include "../h/systm.h" @@ -21,6 +21,7 @@ #endif #include "../h/descrip.h" #include "../h/uio.h" +#include "../h/cmap.h" /* * Read system call. @@ -200,8 +201,7 @@ rwip(ip, uio, rw) struct buf *bp; struct fs *fs; daddr_t lbn, bn; - register int on, type; - register unsigned n; + register int n, on, type; int size; long bsize; extern int mem_no; diff --git a/usr/src/sys/kern/vfs_lookup.c b/usr/src/sys/kern/vfs_lookup.c index d676e75665..02c6c9817b 100644 --- a/usr/src/sys/kern/vfs_lookup.c +++ b/usr/src/sys/kern/vfs_lookup.c @@ -1,4 +1,4 @@ -/* vfs_lookup.c 4.27 82/10/17 */ +/* vfs_lookup.c 4.28 82/10/19 */ #include "../h/param.h" #include "../h/systm.h" @@ -564,7 +564,7 @@ direnter(ip) ep->d_reclen = dsize; ep = (struct direct *)((char *)ep + dsize); } - bcopy((caddr_t)&u.u_dent, (caddr_t)ep, newentrysize); + bcopy((caddr_t)&u.u_dent, (caddr_t)ep, (u_int)newentrysize); bwrite(bp); u.u_pdir->i_flag |= IUPD|ICHG; iput(u.u_pdir); @@ -610,10 +610,10 @@ blkatoff(ip, offset, res) char **res; { register struct fs *fs = ip->i_fs; - int lbn = lblkno(fs, offset); + daddr_t lbn = lblkno(fs, offset); int base = blkoff(fs, offset); int bsize = blksize(fs, ip, lbn); - int bn = fsbtodb(fs, bmap(ip, lbn, B_WRITE, base, bsize)); + daddr_t bn = fsbtodb(fs, bmap(ip, lbn, B_WRITE, base, bsize)); register struct buf *bp; if (u.u_error) diff --git a/usr/src/sys/kern/vfs_syscalls.c b/usr/src/sys/kern/vfs_syscalls.c index 347150b132..4d9d278cbb 100644 --- a/usr/src/sys/kern/vfs_syscalls.c +++ b/usr/src/sys/kern/vfs_syscalls.c @@ -1,4 +1,4 @@ -/* vfs_syscalls.c 4.40 82/10/17 */ +/* vfs_syscalls.c 4.41 82/10/19 */ #include "../h/param.h" #include "../h/systm.h" @@ -234,7 +234,7 @@ link() } ip->i_nlink++; ip->i_flag |= ICHG; - iupdat(ip, time, time, 1); + iupdat(ip, &time, &time, 1); iunlock(ip); u.u_dirp = (caddr_t)uap->linkname; xp = namei(uchar, 1, 0); @@ -481,7 +481,7 @@ stat1(ip, ub) { struct stat ds; - IUPDAT(ip, time, time, 0); + IUPDAT(ip, &time, &time, 0); /* * Copy from inode table */ @@ -732,7 +732,7 @@ outime() sync() { - update(0); + update(); } flock() @@ -869,7 +869,7 @@ maknode(mode) /* * Make sure inode goes to disk before directory entry. */ - iupdat(ip, time, time, 1); + iupdat(ip, &time, &time, 1); direnter(ip); if (u.u_error) { /* diff --git a/usr/src/sys/ufs/ffs/ffs_alloc.c b/usr/src/sys/ufs/ffs/ffs_alloc.c index 6a1f2fb984..6eeec1096f 100644 --- a/usr/src/sys/ufs/ffs/ffs_alloc.c +++ b/usr/src/sys/ufs/ffs/ffs_alloc.c @@ -1,4 +1,4 @@ -/* ffs_alloc.c 2.16 82/10/17 */ +/* ffs_alloc.c 2.17 82/10/19 */ #include "../h/param.h" #include "../h/systm.h" @@ -985,7 +985,7 @@ update() continue; ip->i_flag |= ILOCKED; ip->i_count++; - iupdat(ip, time, time, 0); + iupdat(ip, &time, &time, 0); iput(ip); } updlock = 0; diff --git a/usr/src/sys/ufs/ffs/ffs_inode.c b/usr/src/sys/ufs/ffs/ffs_inode.c index 5c5c24226d..c7adeef4d0 100644 --- a/usr/src/sys/ufs/ffs/ffs_inode.c +++ b/usr/src/sys/ufs/ffs/ffs_inode.c @@ -1,4 +1,4 @@ -/* ffs_inode.c 4.28 82/10/17 */ +/* ffs_inode.c 4.29 82/10/19 */ #include "../h/param.h" #include "../h/systm.h" @@ -248,7 +248,7 @@ irele(ip) ip->i_dquot = NODQUOT; #endif } - IUPDAT(ip, time, time, 0); + IUPDAT(ip, &time, &time, 0); iunlock(ip); ip->i_flag = 0; /* @@ -328,7 +328,6 @@ itrunc(ip, length) register int length; { register i; - dev_t dev; daddr_t bn; struct inode itmp; register struct fs *fs; @@ -357,7 +356,7 @@ itrunc(ip, length) for (i = 0; i < NIADDR; i++) itmp.i_ib[i] = 0; itmp.i_flag |= ICHG|IUPD; - iupdat(&itmp, time, time, 1); + iupdat(&itmp, &time, &time, 1); ip->i_flag &= ~(IUPD|IACC|ICHG); /* @@ -393,8 +392,6 @@ itrunc(ip, length) * finally release direct blocks */ for (i = NDADDR - 1; i>=0; i--) { - register size; - bn = ip->i_db[i]; if (bn == (daddr_t)0) continue; diff --git a/usr/src/sys/ufs/ffs/ffs_vnops.c b/usr/src/sys/ufs/ffs/ffs_vnops.c index c6231d911c..e185d2abf7 100644 --- a/usr/src/sys/ufs/ffs/ffs_vnops.c +++ b/usr/src/sys/ufs/ffs/ffs_vnops.c @@ -1,4 +1,4 @@ -/* ffs_vnops.c 4.40 82/10/17 */ +/* ffs_vnops.c 4.41 82/10/19 */ #include "../h/param.h" #include "../h/systm.h" @@ -234,7 +234,7 @@ link() } ip->i_nlink++; ip->i_flag |= ICHG; - iupdat(ip, time, time, 1); + iupdat(ip, &time, &time, 1); iunlock(ip); u.u_dirp = (caddr_t)uap->linkname; xp = namei(uchar, 1, 0); @@ -481,7 +481,7 @@ stat1(ip, ub) { struct stat ds; - IUPDAT(ip, time, time, 0); + IUPDAT(ip, &time, &time, 0); /* * Copy from inode table */ @@ -732,7 +732,7 @@ outime() sync() { - update(0); + update(); } flock() @@ -869,7 +869,7 @@ maknode(mode) /* * Make sure inode goes to disk before directory entry. */ - iupdat(ip, time, time, 1); + iupdat(ip, &time, &time, 1); direnter(ip); if (u.u_error) { /* diff --git a/usr/src/sys/ufs/ffs/ufs_inode.c b/usr/src/sys/ufs/ffs/ufs_inode.c index ee689f965e..3bb7ac1349 100644 --- a/usr/src/sys/ufs/ffs/ufs_inode.c +++ b/usr/src/sys/ufs/ffs/ufs_inode.c @@ -1,4 +1,4 @@ -/* ufs_inode.c 4.28 82/10/17 */ +/* ufs_inode.c 4.29 82/10/19 */ #include "../h/param.h" #include "../h/systm.h" @@ -248,7 +248,7 @@ irele(ip) ip->i_dquot = NODQUOT; #endif } - IUPDAT(ip, time, time, 0); + IUPDAT(ip, &time, &time, 0); iunlock(ip); ip->i_flag = 0; /* @@ -328,7 +328,6 @@ itrunc(ip, length) register int length; { register i; - dev_t dev; daddr_t bn; struct inode itmp; register struct fs *fs; @@ -357,7 +356,7 @@ itrunc(ip, length) for (i = 0; i < NIADDR; i++) itmp.i_ib[i] = 0; itmp.i_flag |= ICHG|IUPD; - iupdat(&itmp, time, time, 1); + iupdat(&itmp, &time, &time, 1); ip->i_flag &= ~(IUPD|IACC|ICHG); /* @@ -393,8 +392,6 @@ itrunc(ip, length) * finally release direct blocks */ for (i = NDADDR - 1; i>=0; i--) { - register size; - bn = ip->i_db[i]; if (bn == (daddr_t)0) continue; diff --git a/usr/src/sys/ufs/ffs/ufs_lookup.c b/usr/src/sys/ufs/ffs/ufs_lookup.c index df792e4d27..52708d5089 100644 --- a/usr/src/sys/ufs/ffs/ufs_lookup.c +++ b/usr/src/sys/ufs/ffs/ufs_lookup.c @@ -1,4 +1,4 @@ -/* ufs_lookup.c 4.27 82/10/17 */ +/* ufs_lookup.c 4.28 82/10/19 */ #include "../h/param.h" #include "../h/systm.h" @@ -564,7 +564,7 @@ direnter(ip) ep->d_reclen = dsize; ep = (struct direct *)((char *)ep + dsize); } - bcopy((caddr_t)&u.u_dent, (caddr_t)ep, newentrysize); + bcopy((caddr_t)&u.u_dent, (caddr_t)ep, (u_int)newentrysize); bwrite(bp); u.u_pdir->i_flag |= IUPD|ICHG; iput(u.u_pdir); @@ -610,10 +610,10 @@ blkatoff(ip, offset, res) char **res; { register struct fs *fs = ip->i_fs; - int lbn = lblkno(fs, offset); + daddr_t lbn = lblkno(fs, offset); int base = blkoff(fs, offset); int bsize = blksize(fs, ip, lbn); - int bn = fsbtodb(fs, bmap(ip, lbn, B_WRITE, base, bsize)); + daddr_t bn = fsbtodb(fs, bmap(ip, lbn, B_WRITE, base, bsize)); register struct buf *bp; if (u.u_error) diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c index 84bf18d0bb..bfce70338a 100644 --- a/usr/src/sys/ufs/ffs/ufs_vnops.c +++ b/usr/src/sys/ufs/ffs/ufs_vnops.c @@ -1,4 +1,4 @@ -/* ufs_vnops.c 4.40 82/10/17 */ +/* ufs_vnops.c 4.41 82/10/19 */ #include "../h/param.h" #include "../h/systm.h" @@ -234,7 +234,7 @@ link() } ip->i_nlink++; ip->i_flag |= ICHG; - iupdat(ip, time, time, 1); + iupdat(ip, &time, &time, 1); iunlock(ip); u.u_dirp = (caddr_t)uap->linkname; xp = namei(uchar, 1, 0); @@ -481,7 +481,7 @@ stat1(ip, ub) { struct stat ds; - IUPDAT(ip, time, time, 0); + IUPDAT(ip, &time, &time, 0); /* * Copy from inode table */ @@ -732,7 +732,7 @@ outime() sync() { - update(0); + update(); } flock() @@ -869,7 +869,7 @@ maknode(mode) /* * Make sure inode goes to disk before directory entry. */ - iupdat(ip, time, time, 1); + iupdat(ip, &time, &time, 1); direnter(ip); if (u.u_error) { /* diff --git a/usr/src/sys/ufs/lfs/lfs_alloc.c b/usr/src/sys/ufs/lfs/lfs_alloc.c index 5ab60e33a3..c1696c822f 100644 --- a/usr/src/sys/ufs/lfs/lfs_alloc.c +++ b/usr/src/sys/ufs/lfs/lfs_alloc.c @@ -1,4 +1,4 @@ -/* lfs_alloc.c 2.16 82/10/17 */ +/* lfs_alloc.c 2.17 82/10/19 */ #include "../h/param.h" #include "../h/systm.h" @@ -985,7 +985,7 @@ update() continue; ip->i_flag |= ILOCKED; ip->i_count++; - iupdat(ip, time, time, 0); + iupdat(ip, &time, &time, 0); iput(ip); } updlock = 0; diff --git a/usr/src/sys/ufs/lfs/lfs_inode.c b/usr/src/sys/ufs/lfs/lfs_inode.c index 83b7b7aae1..43048b4c2b 100644 --- a/usr/src/sys/ufs/lfs/lfs_inode.c +++ b/usr/src/sys/ufs/lfs/lfs_inode.c @@ -1,4 +1,4 @@ -/* lfs_inode.c 4.28 82/10/17 */ +/* lfs_inode.c 4.29 82/10/19 */ #include "../h/param.h" #include "../h/systm.h" @@ -248,7 +248,7 @@ irele(ip) ip->i_dquot = NODQUOT; #endif } - IUPDAT(ip, time, time, 0); + IUPDAT(ip, &time, &time, 0); iunlock(ip); ip->i_flag = 0; /* @@ -328,7 +328,6 @@ itrunc(ip, length) register int length; { register i; - dev_t dev; daddr_t bn; struct inode itmp; register struct fs *fs; @@ -357,7 +356,7 @@ itrunc(ip, length) for (i = 0; i < NIADDR; i++) itmp.i_ib[i] = 0; itmp.i_flag |= ICHG|IUPD; - iupdat(&itmp, time, time, 1); + iupdat(&itmp, &time, &time, 1); ip->i_flag &= ~(IUPD|IACC|ICHG); /* @@ -393,8 +392,6 @@ itrunc(ip, length) * finally release direct blocks */ for (i = NDADDR - 1; i>=0; i--) { - register size; - bn = ip->i_db[i]; if (bn == (daddr_t)0) continue; diff --git a/usr/src/sys/ufs/lfs/lfs_vnops.c b/usr/src/sys/ufs/lfs/lfs_vnops.c index de458ac382..5cd55d875e 100644 --- a/usr/src/sys/ufs/lfs/lfs_vnops.c +++ b/usr/src/sys/ufs/lfs/lfs_vnops.c @@ -1,4 +1,4 @@ -/* lfs_vnops.c 4.40 82/10/17 */ +/* lfs_vnops.c 4.41 82/10/19 */ #include "../h/param.h" #include "../h/systm.h" @@ -234,7 +234,7 @@ link() } ip->i_nlink++; ip->i_flag |= ICHG; - iupdat(ip, time, time, 1); + iupdat(ip, &time, &time, 1); iunlock(ip); u.u_dirp = (caddr_t)uap->linkname; xp = namei(uchar, 1, 0); @@ -481,7 +481,7 @@ stat1(ip, ub) { struct stat ds; - IUPDAT(ip, time, time, 0); + IUPDAT(ip, &time, &time, 0); /* * Copy from inode table */ @@ -732,7 +732,7 @@ outime() sync() { - update(0); + update(); } flock() @@ -869,7 +869,7 @@ maknode(mode) /* * Make sure inode goes to disk before directory entry. */ - iupdat(ip, time, time, 1); + iupdat(ip, &time, &time, 1); direnter(ip); if (u.u_error) { /* diff --git a/usr/src/sys/ufs/ufs/ufs_inode.c b/usr/src/sys/ufs/ufs/ufs_inode.c index ee689f965e..3bb7ac1349 100644 --- a/usr/src/sys/ufs/ufs/ufs_inode.c +++ b/usr/src/sys/ufs/ufs/ufs_inode.c @@ -1,4 +1,4 @@ -/* ufs_inode.c 4.28 82/10/17 */ +/* ufs_inode.c 4.29 82/10/19 */ #include "../h/param.h" #include "../h/systm.h" @@ -248,7 +248,7 @@ irele(ip) ip->i_dquot = NODQUOT; #endif } - IUPDAT(ip, time, time, 0); + IUPDAT(ip, &time, &time, 0); iunlock(ip); ip->i_flag = 0; /* @@ -328,7 +328,6 @@ itrunc(ip, length) register int length; { register i; - dev_t dev; daddr_t bn; struct inode itmp; register struct fs *fs; @@ -357,7 +356,7 @@ itrunc(ip, length) for (i = 0; i < NIADDR; i++) itmp.i_ib[i] = 0; itmp.i_flag |= ICHG|IUPD; - iupdat(&itmp, time, time, 1); + iupdat(&itmp, &time, &time, 1); ip->i_flag &= ~(IUPD|IACC|ICHG); /* @@ -393,8 +392,6 @@ itrunc(ip, length) * finally release direct blocks */ for (i = NDADDR - 1; i>=0; i--) { - register size; - bn = ip->i_db[i]; if (bn == (daddr_t)0) continue; diff --git a/usr/src/sys/ufs/ufs/ufs_lookup.c b/usr/src/sys/ufs/ufs/ufs_lookup.c index df792e4d27..52708d5089 100644 --- a/usr/src/sys/ufs/ufs/ufs_lookup.c +++ b/usr/src/sys/ufs/ufs/ufs_lookup.c @@ -1,4 +1,4 @@ -/* ufs_lookup.c 4.27 82/10/17 */ +/* ufs_lookup.c 4.28 82/10/19 */ #include "../h/param.h" #include "../h/systm.h" @@ -564,7 +564,7 @@ direnter(ip) ep->d_reclen = dsize; ep = (struct direct *)((char *)ep + dsize); } - bcopy((caddr_t)&u.u_dent, (caddr_t)ep, newentrysize); + bcopy((caddr_t)&u.u_dent, (caddr_t)ep, (u_int)newentrysize); bwrite(bp); u.u_pdir->i_flag |= IUPD|ICHG; iput(u.u_pdir); @@ -610,10 +610,10 @@ blkatoff(ip, offset, res) char **res; { register struct fs *fs = ip->i_fs; - int lbn = lblkno(fs, offset); + daddr_t lbn = lblkno(fs, offset); int base = blkoff(fs, offset); int bsize = blksize(fs, ip, lbn); - int bn = fsbtodb(fs, bmap(ip, lbn, B_WRITE, base, bsize)); + daddr_t bn = fsbtodb(fs, bmap(ip, lbn, B_WRITE, base, bsize)); register struct buf *bp; if (u.u_error) diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c index 84bf18d0bb..bfce70338a 100644 --- a/usr/src/sys/ufs/ufs/ufs_vnops.c +++ b/usr/src/sys/ufs/ufs/ufs_vnops.c @@ -1,4 +1,4 @@ -/* ufs_vnops.c 4.40 82/10/17 */ +/* ufs_vnops.c 4.41 82/10/19 */ #include "../h/param.h" #include "../h/systm.h" @@ -234,7 +234,7 @@ link() } ip->i_nlink++; ip->i_flag |= ICHG; - iupdat(ip, time, time, 1); + iupdat(ip, &time, &time, 1); iunlock(ip); u.u_dirp = (caddr_t)uap->linkname; xp = namei(uchar, 1, 0); @@ -481,7 +481,7 @@ stat1(ip, ub) { struct stat ds; - IUPDAT(ip, time, time, 0); + IUPDAT(ip, &time, &time, 0); /* * Copy from inode table */ @@ -732,7 +732,7 @@ outime() sync() { - update(0); + update(); } flock() @@ -869,7 +869,7 @@ maknode(mode) /* * Make sure inode goes to disk before directory entry. */ - iupdat(ip, time, time, 1); + iupdat(ip, &time, &time, 1); direnter(ip); if (u.u_error) { /* -- 2.20.1