From a29f79959a4152d21668d9bf6794d0e83429daa0 Mon Sep 17 00:00:00 2001 From: Bill Joy Date: Fri, 22 Oct 1982 07:56:43 -0800 Subject: [PATCH] lint SCCS-vsn: sys/kern/subr_rmap.c 4.8 SCCS-vsn: sys/kern/subr_rmap.c.sav 4.8 SCCS-vsn: sys/kern/sys_generic.c 5.21 SCCS-vsn: sys/kern/uipc_mbuf.c 1.40 SCCS-vsn: sys/kern/uipc_socket.c 4.60 SCCS-vsn: sys/vm/vm_swap.c 4.11 SCCS-vsn: sys/vax/vax/conf.c 4.60 SCCS-vsn: sys/vax/vax/machdep.c 4.67 --- usr/src/sys/kern/subr_rmap.c | 4 ++-- usr/src/sys/kern/subr_rmap.c.sav | 4 ++-- usr/src/sys/kern/sys_generic.c | 4 ++-- usr/src/sys/kern/uipc_mbuf.c | 4 ++-- usr/src/sys/kern/uipc_socket.c | 6 +++--- usr/src/sys/vax/vax/conf.c | 8 ++++---- usr/src/sys/vax/vax/machdep.c | 9 +++++---- usr/src/sys/vm/vm_swap.c | 7 ++++--- 8 files changed, 24 insertions(+), 22 deletions(-) diff --git a/usr/src/sys/kern/subr_rmap.c b/usr/src/sys/kern/subr_rmap.c index 2580341716..0c4acf3b54 100644 --- a/usr/src/sys/kern/subr_rmap.c +++ b/usr/src/sys/kern/subr_rmap.c @@ -1,4 +1,4 @@ -/* subr_rmap.c 4.7 82/10/21 */ +/* subr_rmap.c 4.8 82/10/21 */ #include "../h/param.h" #include "../h/systm.h" @@ -43,7 +43,7 @@ */ rminit(mp, size, addr, name, mapsize) register struct map *mp; - int size, addr; + long size, addr; char *name; int mapsize; { diff --git a/usr/src/sys/kern/subr_rmap.c.sav b/usr/src/sys/kern/subr_rmap.c.sav index 9a04685f1a..b6abab12fe 100644 --- a/usr/src/sys/kern/subr_rmap.c.sav +++ b/usr/src/sys/kern/subr_rmap.c.sav @@ -1,4 +1,4 @@ -/* subr_rmap.c.sav 4.7 82/10/21 */ +/* subr_rmap.c.sav 4.8 82/10/21 */ #include "../h/param.h" #include "../h/systm.h" @@ -43,7 +43,7 @@ */ rminit(mp, size, addr, name, mapsize) register struct map *mp; - int size, addr; + long size, addr; char *name; int mapsize; { diff --git a/usr/src/sys/kern/sys_generic.c b/usr/src/sys/kern/sys_generic.c index a2a1024be1..1fb93e99cc 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.20 82/10/21 */ +/* sys_generic.c 5.21 82/10/21 */ #include "../h/param.h" #include "../h/systm.h" @@ -293,7 +293,7 @@ rwip(ip, uio, rw) goto bad; } u.u_error = - (void) uiomove(bp->b_un.b_addr+on, n, rw, uio); + uiomove(bp->b_un.b_addr+on, n, rw, uio); if (rw == UIO_READ) { if (n + on == bsize || uio->uio_offset == ip->i_size) bp->b_flags |= B_AGE; diff --git a/usr/src/sys/kern/uipc_mbuf.c b/usr/src/sys/kern/uipc_mbuf.c index cedc50038a..f234bbf243 100644 --- a/usr/src/sys/kern/uipc_mbuf.c +++ b/usr/src/sys/kern/uipc_mbuf.c @@ -1,4 +1,4 @@ -/* uipc_mbuf.c 1.39 82/10/21 */ +/* uipc_mbuf.c 1.40 82/10/21 */ #include "../h/param.h" #include "../h/dir.h" @@ -35,7 +35,7 @@ m_clalloc(ncl, how) npg = ncl * CLSIZE; s = splimp(); /* careful: rmalloc isn't reentrant */ - mbx = rmalloc(mbmap, npg); + mbx = rmalloc(mbmap, (long)npg); splx(s); if (mbx == 0) return (0); diff --git a/usr/src/sys/kern/uipc_socket.c b/usr/src/sys/kern/uipc_socket.c index 5a907cdf41..9906c8cb83 100644 --- a/usr/src/sys/kern/uipc_socket.c +++ b/usr/src/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* uipc_socket.c 4.59 82/10/21 */ +/* uipc_socket.c 4.60 82/10/21 */ #include "../h/param.h" #include "../h/systm.h" @@ -383,7 +383,7 @@ soreceive(so, aname, uio, flags) if (len > m->m_len) len = m->m_len; error = - (void) uiomove(mtod(m, caddr_t), (int)len, UIO_READ, uio); + uiomove(mtod(m, caddr_t), (int)len, UIO_READ, uio); m = m_free(m); } while (uio->uio_resid && error == 0 && m); if (m) @@ -460,7 +460,7 @@ SBCHECK(&so->so_snd, "soreceive afteraddr"); len = m->m_len - moff; splx(s); error = - (void) uiomove(mtod(m, caddr_t) + moff, (int)len, UIO_READ, uio); + uiomove(mtod(m, caddr_t) + moff, (int)len, UIO_READ, uio); s = splnet(); if (len == m->m_len) { eor = (int)m->m_act; diff --git a/usr/src/sys/vax/vax/conf.c b/usr/src/sys/vax/vax/conf.c index 6ef448e5f9..1a3f7594a2 100644 --- a/usr/src/sys/vax/vax/conf.c +++ b/usr/src/sys/vax/vax/conf.c @@ -1,4 +1,4 @@ -/* conf.c 4.59 82/10/21 */ +/* conf.c 4.60 82/10/21 */ #include "../h/param.h" #include "../h/systm.h" @@ -424,9 +424,9 @@ struct cdevsw cdevsw[] = nodev, nodev, nodev, 0, nodev, #endif - nodev, nodev, nodev, nodev, /*9*/ - nodev, nodev, nodev, 0, - nodev, + udopen, nulldev, udread, udwrite, /*9*/ + udioctl, nodev, udreset, 0, + seltrue, vaopen, vaclose, nodev, vawrite, /*10*/ vaioctl, nulldev, vareset, 0, vaselect, diff --git a/usr/src/sys/vax/vax/machdep.c b/usr/src/sys/vax/vax/machdep.c index 5e66c00065..9f1bbc9b68 100644 --- a/usr/src/sys/vax/vax/machdep.c +++ b/usr/src/sys/vax/vax/machdep.c @@ -1,4 +1,4 @@ -/* machdep.c 4.66 82/10/20 */ +/* machdep.c 4.67 82/10/21 */ #include "../h/param.h" #include "../h/systm.h" @@ -179,9 +179,10 @@ startup(firstaddr) meminit(unixsize, maxmem); maxmem = freemem; printf("avail mem = %d\n", ctob(maxmem)); - rminit(kernelmap, USRPTSIZE, 1, "usrpt", nproc); - rminit(mbmap, (nmbclusters - 1) * CLSIZE, CLSIZE, "mbclusters", - nmbclusters/4); + rminit(kernelmap, (long)USRPTSIZE, (long)1, + "usrpt", nproc); + rminit(mbmap, (long)((nmbclusters - 1) * CLSIZE), (long)CLSIZE, + "mbclusters", nmbclusters/4); /* * Configure the system. diff --git a/usr/src/sys/vm/vm_swap.c b/usr/src/sys/vm/vm_swap.c index cac0dc347b..490ae26f7d 100644 --- a/usr/src/sys/vm/vm_swap.c +++ b/usr/src/sys/vm/vm_swap.c @@ -1,4 +1,4 @@ -/* vm_swap.c 4.10 82/10/21 */ +/* vm_swap.c 4.11 82/10/21 */ #include "../h/param.h" #include "../h/systm.h" @@ -129,13 +129,14 @@ swfree(index) * hunk which needs special treatment anyways. */ argdev = swdevt[0].sw_dev; - rminit(argmap, blk/2-CLSIZE, CLSIZE, + rminit(argmap, (long)(blk/2-CLSIZE), (long)CLSIZE, "argmap", ARGMAPSIZE); /* * First of all chunks... initialize the swapmap * the second half of the hunk. */ - rminit(swapmap, blk/2, blk/2, "swap", nswapmap); + rminit(swapmap, (long)blk/2, (long)blk/2, + "swap", nswapmap); } else rmfree(swapmap, blk, vsbase); } -- 2.20.1