lint

SCCS-vsn: sys/miscfs/portal/portal_vnops.c 8.4
SCCS-vsn: sys/miscfs/umapfs/umap_vnops.c 8.2
SCCS-vsn: sys/net/if.c 8.3
SCCS-vsn: sys/net/if_sl.c 8.3
SCCS-vsn: sys/net/radix.c 8.2
SCCS-vsn: sys/net/rtsock.c 8.3
SCCS-vsn: sys/netinet/in_pcb.c 8.2
SCCS-vsn: sys/netinet/ip_icmp.c 8.2
SCCS-vsn: sys/netinet/ip_input.c 8.2
SCCS-vsn: sys/netinet/raw_ip.c 8.2
SCCS-vsn: sys/netinet/tcp_input.c 8.3
SCCS-vsn: sys/netinet/udp_usrreq.c 8.3
SCCS-vsn: sys/nfs/nfs_bio.c 8.5
SCCS-vsn: sys/nfs/nfs_nqlease.c 8.3
SCCS-vsn: sys/nfs/nfs_serv.c 8.2
SCCS-vsn: sys/nfs/nfs_subs.c 8.3
SCCS-vsn: sys/nfs/nfs_syscalls.c 8.3
SCCS-vsn: sys/nfs/nfs_vfsops.c 8.3
SCCS-vsn: sys/ufs/ffs/ffs_alloc.c 8.4
SCCS-vsn: sys/ufs/ffs/ffs_vfsops.c 8.5
SCCS-vsn: sys/ufs/ffs/ufs_readwrite.c 8.4
SCCS-vsn: sys/ufs/ufs/ufs_readwrite.c 8.4
SCCS-vsn: sys/ufs/ffs/ffs_vnops.c 8.5
SCCS-vsn: sys/ufs/lfs/lfs_alloc.c 8.4
SCCS-vsn: sys/ufs/lfs/lfs_segment.c 8.5
SCCS-vsn: sys/ufs/lfs/lfs_vfsops.c 8.4
SCCS-vsn: sys/ufs/ffs/ufs_bmap.c 8.5
SCCS-vsn: sys/ufs/ufs/ufs_bmap.c 8.5
SCCS-vsn: sys/ufs/ffs/ufs_lockf.c 8.2
SCCS-vsn: sys/ufs/ufs/ufs_lockf.c 8.2
SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 8.7
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 8.7
SCCS-vsn: sys/vm/vm_kern.c 8.2
SCCS-vsn: sys/vm/vm_map.c 8.2
SCCS-vsn: sys/vm/vm_meter.c 8.4
SCCS-vsn: sys/vm/vm_pager.c 8.5

diff --git a/usr/src/sys/miscfs/portal/portal_vnops.c b/usr/src/sys/miscfs/portal/portal_vnops.c
index 6bf9d9c..26244b9 100644 (file)
--- a/usr/src/sys/miscfs/portal/portal_vnops.c
+++ b/usr/src/sys/miscfs/portal/portal_vnops.c
@@ -8,7 +8,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)portal_vnops.c      8.3 (Berkeley) %G%
+ *     @(#)portal_vnops.c      8.4 (Berkeley) %G%

  *
  * $Id: portal_vnops.c,v 1.4 1992/05/30 10:05:24 jsp Exp jsp $
  */
  *
  * $Id: portal_vnops.c,v 1.4 1992/05/30 10:05:24 jsp Exp jsp $
  */


@@ -489,10 +489,8 @@ portal_getattr(ap)
 {
        struct vnode *vp = ap->a_vp;
        struct vattr *vap = ap->a_vap;
 {
        struct vnode *vp = ap->a_vp;
        struct vattr *vap = ap->a_vap;

-       unsigned fd;
-       int error;

 
 

-       bzero((caddr_t) vap, sizeof(*vap));
+       bzero(vap, sizeof(*vap));

        vattr_null(vap);
        vap->va_uid = 0;
        vap->va_gid = 0;
        vattr_null(vap);
        vap->va_uid = 0;
        vap->va_gid = 0;

diff --git a/usr/src/sys/miscfs/umapfs/umap_vnops.c b/usr/src/sys/miscfs/umapfs/umap_vnops.c
index f6c2f7d..6f562de 100644 (file)
--- a/usr/src/sys/miscfs/umapfs/umap_vnops.c
+++ b/usr/src/sys/miscfs/umapfs/umap_vnops.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)umap_vnops.c        8.1 (Berkeley) %G%
+ *     @(#)umap_vnops.c        8.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -40,9 +40,7 @@ umap_bypass(ap)
        } */ *ap;
 {
        extern int (**umap_vnodeop_p)();  /* not extern, really "forward" */
        } */ *ap;
 {
        extern int (**umap_vnodeop_p)();  /* not extern, really "forward" */

-       int *mapdata, nentries ;
-       int *gmapdata, gnentries ;
-       struct ucred **credpp,*credp, *savecredp, *saveucredp, *savecompcredp ;
+       struct ucred **credpp,*credp, *savecredp, *savecompcredp;

        struct ucred *compcredp;
        register struct vnode **this_vp_p;
        int error;
        struct ucred *compcredp;
        register struct vnode **this_vp_p;
        int error;

diff --git a/usr/src/sys/net/if.c b/usr/src/sys/net/if.c
index d702204..9ac3f75 100644 (file)
--- a/usr/src/sys/net/if.c
+++ b/usr/src/sys/net/if.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)if.c        8.2 (Berkeley) %G%
+ *     @(#)if.c        8.3 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -292,7 +292,7 @@ link_rtrequest(cmd, rt, sa)
 {
        register struct ifaddr *ifa;
        struct sockaddr *dst;
 {
        register struct ifaddr *ifa;
        struct sockaddr *dst;

-       struct ifnet *ifp, *oldifnet = ifnet;
+       struct ifnet *ifp;

 
        if (cmd != RTM_ADD || ((ifa = rt->rt_ifa) == 0) ||
            ((ifp = ifa->ifa_ifp) == 0) || ((dst = rt_key(rt)) == 0))
 
        if (cmd != RTM_ADD || ((ifa = rt->rt_ifa) == 0) ||
            ((ifp = ifa->ifa_ifp) == 0) || ((dst = rt_key(rt)) == 0))

diff --git a/usr/src/sys/net/if_sl.c b/usr/src/sys/net/if_sl.c
index 8a62c4a..478d77a 100644 (file)
--- a/usr/src/sys/net/if_sl.c
+++ b/usr/src/sys/net/if_sl.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)if_sl.c     8.2 (Berkeley) %G%
+ *     @(#)if_sl.c     8.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -264,7 +264,6 @@ sltioctl(tp, cmd, data, flag)
        int flag;
 {
        struct sl_softc *sc = (struct sl_softc *)tp->t_sc;
        int flag;
 {
        struct sl_softc *sc = (struct sl_softc *)tp->t_sc;

-       int s;

 
        switch (cmd) {
        case SLIOCGUNIT:
 
        switch (cmd) {
        case SLIOCGUNIT:

diff --git a/usr/src/sys/net/radix.c b/usr/src/sys/net/radix.c
index e11b38d..170a19f 100644 (file)
--- a/usr/src/sys/net/radix.c
+++ b/usr/src/sys/net/radix.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)radix.c     8.1 (Berkeley) %G%
+ *     @(#)radix.c     8.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -357,13 +357,11 @@ rn_addroute(v_arg, n_arg, head, treenodes)
        struct radix_node treenodes[2];
 {
        caddr_t v = (caddr_t)v_arg, netmask = (caddr_t)n_arg;
        struct radix_node treenodes[2];
 {
        caddr_t v = (caddr_t)v_arg, netmask = (caddr_t)n_arg;

-       register int j;
-       register caddr_t cp;

        register struct radix_node *t, *x, *tt;
        struct radix_node *saved_tt, *top = head->rnh_treetop;
        short b = 0, b_leaf;
        register struct radix_node *t, *x, *tt;
        struct radix_node *saved_tt, *top = head->rnh_treetop;
        short b = 0, b_leaf;

-       int vlen = *(u_char *)v, mlen, keyduplicated;
-       caddr_t cplim; unsigned char *maskp;
+       int mlen, keyduplicated;
+       caddr_t cplim;

        struct radix_mask *m, **mp;
 
        /*
        struct radix_mask *m, **mp;
 
        /*

diff --git a/usr/src/sys/net/rtsock.c b/usr/src/sys/net/rtsock.c
index d8d15b4..9c161e8 100644 (file)
--- a/usr/src/sys/net/rtsock.c
+++ b/usr/src/sys/net/rtsock.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)rtsock.c    8.2 (Berkeley) %G%
+ *     @(#)rtsock.c    8.3 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -54,6 +54,7 @@ route_usrreq(so, req, m, nam, control)
        register int error = 0;
        register struct rawcb *rp = sotorawcb(so);
        int s;
        register int error = 0;
        register struct rawcb *rp = sotorawcb(so);
        int s;

+

        if (req == PRU_ATTACH) {
                MALLOC(rp, struct rawcb *, sizeof(*rp), M_PCB, M_WAITOK);
                if (so->so_pcb = (caddr_t)rp)
        if (req == PRU_ATTACH) {
                MALLOC(rp, struct rawcb *, sizeof(*rp), M_PCB, M_WAITOK);
                if (so->so_pcb = (caddr_t)rp)


@@ -274,7 +275,6 @@ flush:
                else 
                        rtm->rtm_flags |= RTF_DONE;
        }
                else 
                        rtm->rtm_flags |= RTF_DONE;
        }

-cleanup:

        if (rt)
                rtfree(rt);
     {
        if (rt)
                rtfree(rt);
     {


@@ -535,7 +535,6 @@ rt_missmsg(type, rtinfo, flags, error)
 {
        register struct rt_msghdr *rtm;
        register struct mbuf *m;
 {
        register struct rt_msghdr *rtm;
        register struct mbuf *m;

-       register int i;

        struct sockaddr *sa = rtinfo->rti_info[RTAX_DST];
 
        if (route_cb.any_count == 0)
        struct sockaddr *sa = rtinfo->rti_info[RTAX_DST];
 
        if (route_cb.any_count == 0)


@@ -649,9 +648,8 @@ sysctl_dumpentry(rn, w)
        struct radix_node *rn;
        register struct walkarg *w;
 {
        struct radix_node *rn;
        register struct walkarg *w;
 {

-       register struct sockaddr *sa;

        register struct rtentry *rt = (struct rtentry *)rn;
        register struct rtentry *rt = (struct rtentry *)rn;

-       int n, error = 0, size;
+       int error = 0, size;

        struct rt_addrinfo info;
 
        if (w->w_op == NET_RT_FLAGS && !(rt->rt_flags & w->w_arg))
        struct rt_addrinfo info;
 
        if (w->w_op == NET_RT_FLAGS && !(rt->rt_flags & w->w_arg))


@@ -687,7 +685,6 @@ sysctl_iflist(af, w)
        register struct ifnet *ifp;
        register struct ifaddr *ifa;
        struct  rt_addrinfo info;
        register struct ifnet *ifp;
        register struct ifaddr *ifa;
        struct  rt_addrinfo info;

-       struct  sockaddr *sa;

        int     len, error = 0;
 
        bzero((caddr_t)&info, sizeof(info));
        int     len, error = 0;
 
        bzero((caddr_t)&info, sizeof(info));

diff --git a/usr/src/sys/netinet/in_pcb.c b/usr/src/sys/netinet/in_pcb.c
index 3d6fd62..fdfb1bd 100644 (file)
--- a/usr/src/sys/netinet/in_pcb.c
+++ b/usr/src/sys/netinet/in_pcb.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)in_pcb.c    8.1 (Berkeley) %G%
+ *     @(#)in_pcb.c    8.2 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -36,7 +36,6 @@ in_pcballoc(so, head)
        struct socket *so;
        struct inpcb *head;
 {
        struct socket *so;
        struct inpcb *head;
 {

-       struct mbuf *m;

        register struct inpcb *inp;
 
        MALLOC(inp, struct inpcb *, sizeof(*inp), M_PCB, M_WAITOK);
        register struct inpcb *inp;
 
        MALLOC(inp, struct inpcb *, sizeof(*inp), M_PCB, M_WAITOK);

diff --git a/usr/src/sys/netinet/ip_icmp.c b/usr/src/sys/netinet/ip_icmp.c
index 33f4c25..b8d5048 100644 (file)
--- a/usr/src/sys/netinet/ip_icmp.c
+++ b/usr/src/sys/netinet/ip_icmp.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ip_icmp.c   8.1 (Berkeley) %G%
+ *     @(#)ip_icmp.c   8.2 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -138,7 +138,6 @@ freeit:
        m_freem(n);
 }
 
        m_freem(n);
 }
 

-static struct sockproto icmproto = { AF_INET, IPPROTO_ICMP };

 static struct sockaddr_in icmpsrc = { sizeof (struct sockaddr_in), AF_INET };
 static struct sockaddr_in icmpdst = { sizeof (struct sockaddr_in), AF_INET };
 static struct sockaddr_in icmpgw = { sizeof (struct sockaddr_in), AF_INET };
 static struct sockaddr_in icmpsrc = { sizeof (struct sockaddr_in), AF_INET };
 static struct sockaddr_in icmpdst = { sizeof (struct sockaddr_in), AF_INET };
 static struct sockaddr_in icmpgw = { sizeof (struct sockaddr_in), AF_INET };


@@ -559,9 +558,8 @@ icmp_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
        void *newp;
        size_t newlen;
 {
        void *newp;
        size_t newlen;
 {

-       extern int ip_ttl;

 
 

-       /* all sysctl names at this level are terminal */
+       /* All sysctl names at this level are terminal. */

        if (namelen != 1)
                return (ENOTDIR);
 
        if (namelen != 1)
                return (ENOTDIR);
 

diff --git a/usr/src/sys/netinet/ip_input.c b/usr/src/sys/netinet/ip_input.c
index 8748c68..20f18f2 100644 (file)
--- a/usr/src/sys/netinet/ip_input.c
+++ b/usr/src/sys/netinet/ip_input.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ip_input.c  8.1 (Berkeley) %G%
+ *     @(#)ip_input.c  8.2 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -1079,7 +1079,6 @@ ip_forward(m, srcrt)
            ipsendredirects && !srcrt) {
 #define        RTA(rt) ((struct in_ifaddr *)(rt->rt_ifa))
                u_long src = ntohl(ip->ip_src.s_addr);
            ipsendredirects && !srcrt) {
 #define        RTA(rt) ((struct in_ifaddr *)(rt->rt_ifa))
                u_long src = ntohl(ip->ip_src.s_addr);

-               u_long dst = ntohl(ip->ip_dst.s_addr);

 
                if (RTA(rt) &&
                    (src & RTA(rt)->ia_subnetmask) == RTA(rt)->ia_subnet) {
 
                if (RTA(rt) &&
                    (src & RTA(rt)->ia_subnetmask) == RTA(rt)->ia_subnet) {


@@ -1158,9 +1157,7 @@ ip_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
        void *newp;
        size_t newlen;
 {
        void *newp;
        size_t newlen;
 {

-       extern int ip_ttl;
-
-       /* all sysctl names at this level are terminal */
+       /* All sysctl names at this level are terminal. */

        if (namelen != 1)
                return (ENOTDIR);
 
        if (namelen != 1)
                return (ENOTDIR);
 

diff --git a/usr/src/sys/netinet/raw_ip.c b/usr/src/sys/netinet/raw_ip.c
index 57283d7..aba2da4 100644 (file)
--- a/usr/src/sys/netinet/raw_ip.c
+++ b/usr/src/sys/netinet/raw_ip.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)raw_ip.c    8.1 (Berkeley) %G%
+ *     @(#)raw_ip.c    8.2 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -110,7 +110,6 @@ rip_output(m, so, dst)
 {
        register struct ip *ip;
        register struct inpcb *inp = sotoinpcb(so);
 {
        register struct ip *ip;
        register struct inpcb *inp = sotoinpcb(so);

-       register struct sockaddr_in *sin;

        struct mbuf *opts;
        int flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST;
 
        struct mbuf *opts;
        int flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST;
 

diff --git a/usr/src/sys/netinet/tcp_input.c b/usr/src/sys/netinet/tcp_input.c
index 210bada..0dd7354 100644 (file)
--- a/usr/src/sys/netinet/tcp_input.c
+++ b/usr/src/sys/netinet/tcp_input.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tcp_input.c 8.2 (Berkeley) %G%
+ *     @(#)tcp_input.c 8.3 (Berkeley) %G%

  */
 
 #ifndef TUBA_INCLUDE
  */
 
 #ifndef TUBA_INCLUDE


@@ -1519,7 +1519,7 @@ tcp_mss(tp, offer)
        u_long bufsize;
        struct inpcb *inp;
        struct socket *so;
        u_long bufsize;
        struct inpcb *inp;
        struct socket *so;

-       extern int tcp_mssdflt, tcp_rttdflt;
+       extern int tcp_mssdflt;

 
        inp = tp->t_inpcb;
        ro = &inp->inp_route;
 
        inp = tp->t_inpcb;
        ro = &inp->inp_route;

diff --git a/usr/src/sys/netinet/udp_usrreq.c b/usr/src/sys/netinet/udp_usrreq.c
index 61afddd..229a5af 100644 (file)
--- a/usr/src/sys/netinet/udp_usrreq.c
+++ b/usr/src/sys/netinet/udp_usrreq.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)udp_usrreq.c        8.2 (Berkeley) %G%
+ *     @(#)udp_usrreq.c        8.3 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -600,9 +600,7 @@ udp_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
        void *newp;
        size_t newlen;
 {
        void *newp;
        size_t newlen;
 {

-       extern int ip_ttl;
-
-       /* all sysctl names at this level are terminal */
+       /* All sysctl names at this level are terminal. */

        if (namelen != 1)
                return (ENOTDIR);
 
        if (namelen != 1)
                return (ENOTDIR);
 

diff --git a/usr/src/sys/nfs/nfs_bio.c b/usr/src/sys/nfs/nfs_bio.c
index d1e82cd..10693c8 100644 (file)
--- a/usr/src/sys/nfs/nfs_bio.c
+++ b/usr/src/sys/nfs/nfs_bio.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)nfs_bio.c   8.4 (Berkeley) %G%
+ *     @(#)nfs_bio.c   8.5 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -51,7 +51,7 @@ nfs_bioread(vp, uio, ioflag, cred)
        struct nfsmount *nmp;
        daddr_t lbn, bn, rabn;
        caddr_t baddr;
        struct nfsmount *nmp;
        daddr_t lbn, bn, rabn;
        caddr_t baddr;

-       int got_buf, len, nra, error = 0, n, on, not_readin;
+       int got_buf, nra, error = 0, n, on, not_readin;

 
 #ifdef lint
        ioflag = ioflag;
 
 #ifdef lint
        ioflag = ioflag;

diff --git a/usr/src/sys/nfs/nfs_nqlease.c b/usr/src/sys/nfs/nfs_nqlease.c
index 56bd43d..0037270 100644 (file)
--- a/usr/src/sys/nfs/nfs_nqlease.c
+++ b/usr/src/sys/nfs/nfs_nqlease.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)nfs_nqlease.c       8.2 (Berkeley) %G%
+ *     @(#)nfs_nqlease.c       8.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -573,7 +573,6 @@ nqnfs_serverd()
        struct nqlease *nextlp;
        struct nqm *lphnext, *olphnext;
        struct mbuf *n;
        struct nqlease *nextlp;
        struct nqm *lphnext, *olphnext;
        struct mbuf *n;

-       union nqsrvthead *lhp;

        int i, len, ok;
 
        lp = nqthead.th_chain[0];
        int i, len, ok;
 
        lp = nqthead.th_chain[0];


@@ -681,7 +680,8 @@ nqnfsrv_getlease(nfsd, mrep, md, dpos, cred, nam, mrq)
        nfsm_dissect(tl, u_long *, 2*NFSX_UNSIGNED);
        flags = fxdr_unsigned(int, *tl++);
        nfsd->nd_duration = fxdr_unsigned(int, *tl);
        nfsm_dissect(tl, u_long *, 2*NFSX_UNSIGNED);
        flags = fxdr_unsigned(int, *tl++);
        nfsd->nd_duration = fxdr_unsigned(int, *tl);

-       if (error = nfsrv_fhtovp(fhp, TRUE, &vp, cred, nfsd->nd_slp, nam, &rdonly))
+       if (error = nfsrv_fhtovp(fhp,
+           TRUE, &vp, cred, nfsd->nd_slp, nam, &rdonly))

                nfsm_reply(0);
        if (rdonly && flags == NQL_WRITE) {
                error = EROFS;
                nfsm_reply(0);
        if (rdonly && flags == NQL_WRITE) {
                error = EROFS;


@@ -715,15 +715,12 @@ nqnfsrv_vacated(nfsd, mrep, md, dpos, cred, nam, mrq)
        register struct nqlease *lp;
        register struct nqhost *lph;
        struct nqlease *tlp = (struct nqlease *)0;
        register struct nqlease *lp;
        register struct nqhost *lph;
        struct nqlease *tlp = (struct nqlease *)0;

-       struct vnode *vp;

        nfsv2fh_t nfh;
        fhandle_t *fhp;
        register u_long *tl;
        register long t1;
        struct nqm *lphnext;
        nfsv2fh_t nfh;
        fhandle_t *fhp;
        register u_long *tl;
        register long t1;
        struct nqm *lphnext;

-       union nqsrvthead *lhp;
-       u_quad_t frev;
-       int error = 0, i, len, ok, rdonly, gotit = 0;
+       int error = 0, i, len, ok, gotit = 0;

        char *cp2;
 
        fhp = &nfh.fh_generic;
        char *cp2;
 
        fhp = &nfh.fh_generic;


@@ -788,7 +785,7 @@ nqnfs_getlease(vp, rwflag, cred, p)
        register u_long *tl;
        register caddr_t cp;
        register long t1;
        register u_long *tl;
        register caddr_t cp;
        register long t1;

-       register struct nfsnode *np, *tp;
+       register struct nfsnode *np;

        struct nfsmount *nmp = VFSTONFS(vp->v_mount);
        caddr_t bpos, dpos, cp2;
        time_t reqtime;
        struct nfsmount *nmp = VFSTONFS(vp->v_mount);
        caddr_t bpos, dpos, cp2;
        time_t reqtime;

diff --git a/usr/src/sys/nfs/nfs_serv.c b/usr/src/sys/nfs/nfs_serv.c
index be171a7..39a8faf 100644 (file)
--- a/usr/src/sys/nfs/nfs_serv.c
+++ b/usr/src/sys/nfs/nfs_serv.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)nfs_serv.c  8.1 (Berkeley) %G%
+ *     @(#)nfs_serv.c  8.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -77,7 +77,7 @@ nqnfsrv_access(nfsd, mrep, md, dpos, cred, nam, mrq)
        caddr_t bpos;
        int error = 0, rdonly, cache, mode = 0;
        char *cp2;
        caddr_t bpos;
        int error = 0, rdonly, cache, mode = 0;
        char *cp2;

-       struct mbuf *mb, *mb2, *mreq;
+       struct mbuf *mb, *mreq;

        u_quad_t frev;
 
        fhp = &nfh.fh_generic;
        u_quad_t frev;
 
        fhp = &nfh.fh_generic;


@@ -154,7 +154,7 @@ nfsrv_setattr(nfsd, mrep, md, dpos, cred, nam, mrq)
        register u_long *tl;
        register long t1;
        caddr_t bpos;
        register u_long *tl;
        register long t1;
        caddr_t bpos;

-       int error = 0, rdonly, cache, duration2, cache2;
+       int error = 0, rdonly, cache;

        char *cp2;
        struct mbuf *mb, *mb2, *mreq;
        u_quad_t frev, frev2;
        char *cp2;
        struct mbuf *mb, *mb2, *mreq;
        u_quad_t frev, frev2;


@@ -253,7 +253,7 @@ nfsrv_lookup(nfsd, mrep, md, dpos, cred, nam, mrq)
        register u_long *tl;
        register long t1;
        caddr_t bpos;
        register u_long *tl;
        register long t1;
        caddr_t bpos;

-       int error = 0, rdonly, cache, duration2, cache2, len;
+       int error = 0, cache, duration2, cache2, len;

        char *cp2;
        struct mbuf *mb, *mb2, *mreq;
        struct vattr va, *vap = &va;
        char *cp2;
        struct mbuf *mb, *mb2, *mreq;
        struct vattr va, *vap = &va;


@@ -1168,7 +1168,7 @@ nfsrv_mkdir(nfsd, mrep, md, dpos, cred, nam, mrq)
        register u_long *tl;
        register long t1;
        caddr_t bpos;
        register u_long *tl;
        register long t1;
        caddr_t bpos;

-       int error = 0, rdonly, cache, len;
+       int error = 0, cache, len;

        char *cp2;
        struct mbuf *mb, *mb2, *mreq;
        struct vnode *vp;
        char *cp2;
        struct mbuf *mb, *mb2, *mreq;
        struct vnode *vp;


@@ -1241,7 +1241,7 @@ nfsrv_rmdir(nfsd, mrep, md, dpos, cred, nam, mrq)
        register u_long *tl;
        register long t1;
        caddr_t bpos;
        register u_long *tl;
        register long t1;
        caddr_t bpos;

-       int error = 0, rdonly, cache, len;
+       int error = 0, cache, len;

        char *cp2;
        struct mbuf *mb, *mreq;
        struct vnode *vp;
        char *cp2;
        struct mbuf *mb, *mreq;
        struct vnode *vp;


@@ -1351,7 +1351,6 @@ nfsrv_readdir(nfsd, mrep, md, dpos, cred, nam, mrq)
        fhandle_t *fhp;
        struct uio io;
        struct iovec iv;
        fhandle_t *fhp;
        struct uio io;
        struct iovec iv;

-       struct vattr va;

        int len, nlen, rem, xfer, tsiz, i, error = 0;
        int siz, cnt, fullsiz, eofflag, rdonly, cache;
        u_quad_t frev;
        int len, nlen, rem, xfer, tsiz, i, error = 0;
        int siz, cnt, fullsiz, eofflag, rdonly, cache;
        u_quad_t frev;

diff --git a/usr/src/sys/nfs/nfs_subs.c b/usr/src/sys/nfs/nfs_subs.c
index 1cc9577..b1d731f 100644 (file)
--- a/usr/src/sys/nfs/nfs_subs.c
+++ b/usr/src/sys/nfs/nfs_subs.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)nfs_subs.c  8.2 (Berkeley) %G%
+ *     @(#)nfs_subs.c  8.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -553,7 +553,6 @@ nfsm_strtmbuf(mb, bpos, cp, siz)
 nfs_init()
 {
        register int i;
 nfs_init()
 {
        register int i;

-       union nqsrvthead *lhp;

 
        nfsrtt.pos = 0;
        rpc_vers = txdr_unsigned(RPC_VER2);
 
        nfsrtt.pos = 0;
        rpc_vers = txdr_unsigned(RPC_VER2);

diff --git a/usr/src/sys/nfs/nfs_syscalls.c b/usr/src/sys/nfs/nfs_syscalls.c
index cfe348d..048271f 100644 (file)
--- a/usr/src/sys/nfs/nfs_syscalls.c
+++ b/usr/src/sys/nfs/nfs_syscalls.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)nfs_syscalls.c      8.2 (Berkeley) %G%
+ *     @(#)nfs_syscalls.c      8.3 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -357,7 +357,6 @@ nfssvc_nfsd(nsd, argp, p)
        register struct nfssvc_sock *slp;
        register struct socket *so;
        register int *solockp;
        register struct nfssvc_sock *slp;
        register struct socket *so;
        register int *solockp;

-       struct nfssvc_sock *oslp;

        struct nfsd *nd = nsd->nsd_nfsd;
        struct mbuf *mreq, *nam;
        struct timeval starttime;
        struct nfsd *nd = nsd->nsd_nfsd;
        struct mbuf *mreq, *nam;
        struct timeval starttime;


@@ -619,7 +618,7 @@ done:
 nfssvc_iod(p)
        struct proc *p;
 {
 nfssvc_iod(p)
        struct proc *p;
 {

-       register struct buf *bp, *dp;
+       register struct buf *bp;

        register int i, myiod;
        int error = 0;
 
        register int i, myiod;
        int error = 0;
 

diff --git a/usr/src/sys/nfs/nfs_vfsops.c b/usr/src/sys/nfs/nfs_vfsops.c
index 1a28883..76c3348 100644 (file)
--- a/usr/src/sys/nfs/nfs_vfsops.c
+++ b/usr/src/sys/nfs/nfs_vfsops.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)nfs_vfsops.c        8.2 (Berkeley) %G%
+ *     @(#)nfs_vfsops.c        8.3 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -62,7 +62,6 @@ struct vfsops nfs_vfsops = {
  */
 struct nfs_diskless nfs_diskless = { 0 };
 
  */
 struct nfs_diskless nfs_diskless = { 0 };
 

-static u_char nfs_mntid;

 extern u_long nfs_procids[NFS_NPROCS];
 extern u_long nfs_prog, nfs_vers;
 void nfs_disconnect __P((struct nfsmount *));
 extern u_long nfs_procids[NFS_NPROCS];
 extern u_long nfs_prog, nfs_vers;
 void nfs_disconnect __P((struct nfsmount *));


@@ -150,7 +149,7 @@ nfs_mountroot()
        struct socket *so;
        struct vnode *vp;
        struct proc *p = curproc;               /* XXX */
        struct socket *so;
        struct vnode *vp;
        struct proc *p = curproc;               /* XXX */

-       int error, i, s;
+       int error, i;

 
        /*
         * XXX time must be non-zero when we init the interface or else
 
        /*
         * XXX time must be non-zero when we init the interface or else


@@ -367,7 +366,6 @@ mountnfs(argp, mp, nam, pth, hst, vpp)
        register struct nfsmount *nmp;
        struct nfsnode *np;
        int error;
        register struct nfsmount *nmp;
        struct nfsnode *np;
        int error;

-       fsid_t tfsid;

 
        if (mp->mnt_flag & MNT_UPDATE) {
                nmp = VFSTONFS(mp);
 
        if (mp->mnt_flag & MNT_UPDATE) {
                nmp = VFSTONFS(mp);

diff --git a/usr/src/sys/ufs/ffs/ffs_alloc.c b/usr/src/sys/ufs/ffs/ffs_alloc.c
index 76dce27..3383244 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_alloc.c
+++ b/usr/src/sys/ufs/ffs/ffs_alloc.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_alloc.c 8.3 (Berkeley) %G%
+ *     @(#)ffs_alloc.c 8.4 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -62,9 +62,8 @@ ffs_alloc(ip, lbn, bpref, size, cred, bnp)
        struct ucred *cred;
        daddr_t *bnp;
 {
        struct ucred *cred;
        daddr_t *bnp;
 {

-       daddr_t bno;

        register struct fs *fs;
        register struct fs *fs;

-       register struct buf *bp;
+       daddr_t bno;

        int cg, error;
        
        *bnp = 0;
        int cg, error;
        
        *bnp = 0;


@@ -129,7 +128,7 @@ ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp)
        struct buf **bpp;
 {
        register struct fs *fs;
        struct buf **bpp;
 {
        register struct fs *fs;

-       struct buf *bp, *obp;
+       struct buf *bp;

        int cg, request, error;
        daddr_t bprev, bno;
        
        int cg, request, error;
        daddr_t bprev, bno;
        

diff --git a/usr/src/sys/ufs/ffs/ffs_vfsops.c b/usr/src/sys/ufs/ffs/ffs_vfsops.c
index 3030195..87e1be9 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_vfsops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vfsops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_vfsops.c        8.4 (Berkeley) %G%
+ *     @(#)ffs_vfsops.c        8.5 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -668,7 +668,6 @@ ffs_vget(mp, ino, vpp)
        struct ufsmount *ump;
        struct buf *bp;
        struct vnode *vp;
        struct ufsmount *ump;
        struct buf *bp;
        struct vnode *vp;

-       union ihead *ih;

        dev_t dev;
        int i, type, error;
 
        dev_t dev;
        int i, type, error;
 

diff --git a/usr/src/sys/ufs/ffs/ffs_vnops.c b/usr/src/sys/ufs/ffs/ffs_vnops.c
index 7ce577c..8706f1e 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_vnops.c 8.4 (Berkeley) %G%
+ *     @(#)ffs_vnops.c 8.5 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -206,7 +206,6 @@ ffs_fsync(ap)
        } */ *ap;
 {
        register struct vnode *vp = ap->a_vp;
        } */ *ap;
 {
        register struct vnode *vp = ap->a_vp;

-       struct inode *ip = VTOI(vp);

        register struct buf *bp;
        struct timeval tv;
        struct buf *nbp;
        register struct buf *bp;
        struct timeval tv;
        struct buf *nbp;

diff --git a/usr/src/sys/ufs/ffs/ufs_bmap.c b/usr/src/sys/ufs/ffs/ufs_bmap.c
index 007d054..4bd5d04 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_bmap.c
+++ b/usr/src/sys/ufs/ffs/ufs_bmap.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_bmap.c  8.4 (Berkeley) %G%
+ *     @(#)ufs_bmap.c  8.5 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -79,10 +79,9 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp)
        struct mount *mp;
        struct vnode *devvp;
        struct indir a[NIADDR], *xap;
        struct mount *mp;
        struct vnode *devvp;
        struct indir a[NIADDR], *xap;

-       daddr_t *bap, daddr;
+       daddr_t daddr;

        long metalbn;
        long metalbn;

-       int bb, error, maxrun, num, off;
-       struct vop_strategy_args vop_strategy_a;
+       int error, maxrun, num;

 
        ip = VTOI(vp);
        mp = vp->v_mount;
 
        ip = VTOI(vp);
        mp = vp->v_mount;

diff --git a/usr/src/sys/ufs/ffs/ufs_lockf.c b/usr/src/sys/ufs/ffs/ufs_lockf.c
index 7a3964d..6c1e77c 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_lockf.c
+++ b/usr/src/sys/ufs/ffs/ufs_lockf.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_lockf.c 8.1 (Berkeley) %G%
+ *     @(#)ufs_lockf.c 8.2 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -355,7 +355,6 @@ lf_getlock(lock, fl)
        register struct flock *fl;
 {
        register struct lockf *block;
        register struct flock *fl;
 {
        register struct lockf *block;

-       off_t start, end;

 
 #ifdef LOCKF_DEBUG
        if (lockf_debug & 1)
 
 #ifdef LOCKF_DEBUG
        if (lockf_debug & 1)

diff --git a/usr/src/sys/ufs/ffs/ufs_readwrite.c b/usr/src/sys/ufs/ffs/ufs_readwrite.c
index b1868a9..7181817 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_readwrite.c
+++ b/usr/src/sys/ufs/ffs/ufs_readwrite.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_readwrite.c     8.3 (Berkeley) %G%
+ *     @(#)ufs_readwrite.c     8.4 (Berkeley) %G%

  */
 
 #ifdef LFS_READWRITE
  */
 
 #ifdef LFS_READWRITE


@@ -43,7 +43,7 @@ READ(ap)
        daddr_t lbn, nextlbn;
        off_t bytesinfile;
        long size, xfersize, blkoffset;
        daddr_t lbn, nextlbn;
        off_t bytesinfile;
        long size, xfersize, blkoffset;

-       int type, nextsize, error;
+       int nextsize, error;

        u_short mode;
 
        vp = ap->a_vp;
        u_short mode;
 
        vp = ap->a_vp;


@@ -148,7 +148,7 @@ WRITE(ap)
        struct proc *p;
        daddr_t lbn;
        off_t osize;
        struct proc *p;
        daddr_t lbn;
        off_t osize;

-       int blkoffset, error, flags, ioflag, newblock, resid, size, xfersize;
+       int blkoffset, error, flags, ioflag, resid, size, xfersize;

 
        ioflag = ap->a_ioflag;
        uio = ap->a_uio;
 
        ioflag = ap->a_ioflag;
        uio = ap->a_uio;

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index d810873..37ff1a1 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 8.6 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 8.7 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -688,8 +688,6 @@ relookup(dvp, vpp, cnp)
        struct componentname *cnp;
 {
        register struct vnode *dp = 0;  /* the directory we are searching */
        struct componentname *cnp;
 {
        register struct vnode *dp = 0;  /* the directory we are searching */

-       struct vnode *tdp;              /* saved dp */
-       struct mount *mp;               /* mount table entry */

        int docache;                    /* == 0 do not cache last component */
        int wantparent;                 /* 1 => wantparent or lockparent flag */
        int rdonly;                     /* lookup read-only flag bit */
        int docache;                    /* == 0 do not cache last component */
        int wantparent;                 /* 1 => wantparent or lockparent flag */
        int rdonly;                     /* lookup read-only flag bit */


@@ -795,7 +793,6 @@ relookup(dvp, vpp, cnp)
                panic ("relookup: symlink found.\n");
 #endif
 
                panic ("relookup: symlink found.\n");
 #endif
 

-nextname:

        /*
         * Check for read-only file systems.
         */
        /*
         * Check for read-only file systems.
         */


@@ -878,7 +875,6 @@ ufs_rename(ap)
        struct timeval tv;
        int doingdirectory = 0, oldparent = 0, newparent = 0;
        int error = 0;
        struct timeval tv;
        int doingdirectory = 0, oldparent = 0, newparent = 0;
        int error = 0;

-       int fdvpneedsrele = 1, tdvpneedsrele = 1;

        u_char namlen;
 
 #ifdef DIAGNOSTIC
        u_char namlen;
 
 #ifdef DIAGNOSTIC

diff --git a/usr/src/sys/ufs/lfs/lfs_alloc.c b/usr/src/sys/ufs/lfs/lfs_alloc.c
index db9df9e..2641590 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_alloc.c
+++ b/usr/src/sys/ufs/lfs/lfs_alloc.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_alloc.c 8.3 (Berkeley) %G%
+ *     @(#)lfs_alloc.c 8.4 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -45,7 +45,7 @@ lfs_valloc(ap)
        daddr_t blkno;
        ino_t new_ino;
        u_long i, max;
        daddr_t blkno;
        ino_t new_ino;
        u_long i, max;

-       int bb, error;
+       int error;

 
        /* Get the head of the freelist. */
        fs = VTOI(ap->a_pvp)->i_lfs;
 
        /* Get the head of the freelist. */
        fs = VTOI(ap->a_pvp)->i_lfs;


@@ -185,7 +185,6 @@ lfs_vfree(ap)
        struct lfs *fs;
        daddr_t old_iaddr;
        ino_t ino;
        struct lfs *fs;
        daddr_t old_iaddr;
        ino_t ino;

-       int error;

 
        /* Get the inode number and file system. */
        ip = VTOI(ap->a_pvp);
 
        /* Get the inode number and file system. */
        ip = VTOI(ap->a_pvp);

diff --git a/usr/src/sys/ufs/lfs/lfs_segment.c b/usr/src/sys/ufs/lfs/lfs_segment.c
index 50ec773..ede1fcb 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_segment.c
+++ b/usr/src/sys/ufs/lfs/lfs_segment.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_segment.c       8.4 (Berkeley) %G%
+ *     @(#)lfs_segment.c       8.5 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -91,7 +91,6 @@ lfs_vflush(vp)
        struct inode *ip;
        struct lfs *fs;
        struct segment *sp;
        struct inode *ip;
        struct lfs *fs;
        struct segment *sp;

-       int error, s;

 
        fs = VFSTOUFS(vp->v_mount)->um_lfs;
        if (fs->lfs_nactive > MAX_ACTIVE)
 
        fs = VFSTOUFS(vp->v_mount)->um_lfs;
        if (fs->lfs_nactive > MAX_ACTIVE)


@@ -132,7 +131,6 @@ lfs_writevnodes(fs, mp, sp, op)
 {
        struct inode *ip;
        struct vnode *vp;
 {
        struct inode *ip;
        struct vnode *vp;

-       int error, s, active;

 
 loop:
        for (vp = mp->mnt_vnodelist.lh_first;
 
 loop:
        for (vp = mp->mnt_vnodelist.lh_first;


@@ -191,8 +189,7 @@ lfs_segwrite(mp, flags)
        SEGUSE *segusep;
        daddr_t ibno;
        CLEANERINFO *cip;
        SEGUSE *segusep;
        daddr_t ibno;
        CLEANERINFO *cip;

-       int clean, error, i, s;
-       int do_ckp;
+       int clean, do_ckp, error, i;

 
        fs = VFSTOUFS(mp)->um_lfs;
 
 
        fs = VFSTOUFS(mp)->um_lfs;
 


@@ -611,7 +608,6 @@ lfs_initseg(fs)
        SEGUSE *sup;
        SEGSUM *ssp;
        struct buf *bp;
        SEGUSE *sup;
        SEGSUM *ssp;
        struct buf *bp;

-       daddr_t lbn, *lbnp;

        int repeat;
 
        sp = fs->lfs_sp;
        int repeat;
 
        sp = fs->lfs_sp;


@@ -684,7 +680,7 @@ lfs_newseg(fs)
        CLEANERINFO *cip;
        SEGUSE *sup;
        struct buf *bp;
        CLEANERINFO *cip;
        SEGUSE *sup;
        struct buf *bp;

-       int curseg, error, isdirty, sn;
+       int curseg, isdirty, sn;

 
         LFS_SEGENTRY(sup, fs, datosn(fs, fs->lfs_nextseg), bp);
         sup->su_flags |= SEGUSE_DIRTY | SEGUSE_ACTIVE;
 
         LFS_SEGENTRY(sup, fs, datosn(fs, fs->lfs_nextseg), bp);
         sup->su_flags |= SEGUSE_DIRTY | SEGUSE_ACTIVE;


@@ -730,7 +726,7 @@ lfs_writeseg(fs, sp)
        dev_t i_dev;
        size_t size;
        u_long *datap, *dp;
        dev_t i_dev;
        size_t size;
        u_long *datap, *dp;

-       int ch_per_blk, do_again, error, i, nblocks, num, s;
+       int ch_per_blk, do_again, i, nblocks, num, s;

        int (*strategy)__P((struct vop_strategy_args *));
        struct vop_strategy_args vop_strategy_a;
        u_short ninos;
        int (*strategy)__P((struct vop_strategy_args *));
        struct vop_strategy_args vop_strategy_a;
        u_short ninos;

diff --git a/usr/src/sys/ufs/lfs/lfs_vfsops.c b/usr/src/sys/ufs/lfs/lfs_vfsops.c
index bf3b5fb..48069b0 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_vfsops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vfsops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_vfsops.c        8.3 (Berkeley) %G%
+ *     @(#)lfs_vfsops.c        8.4 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -372,7 +372,6 @@ lfs_sync(mp, waitfor, cred, p)
        struct ucred *cred;
        struct proc *p;
 {
        struct ucred *cred;
        struct proc *p;
 {

-       extern int syncprt;

        int error;
 
        /* All syncs must be checkpoints until roll-forward is implemented. */
        int error;
 
        /* All syncs must be checkpoints until roll-forward is implemented. */

diff --git a/usr/src/sys/ufs/ufs/ufs_bmap.c b/usr/src/sys/ufs/ufs/ufs_bmap.c
index 007d054..4bd5d04 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_bmap.c
+++ b/usr/src/sys/ufs/ufs/ufs_bmap.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_bmap.c  8.4 (Berkeley) %G%
+ *     @(#)ufs_bmap.c  8.5 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -79,10 +79,9 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp)
        struct mount *mp;
        struct vnode *devvp;
        struct indir a[NIADDR], *xap;
        struct mount *mp;
        struct vnode *devvp;
        struct indir a[NIADDR], *xap;

-       daddr_t *bap, daddr;
+       daddr_t daddr;

        long metalbn;
        long metalbn;

-       int bb, error, maxrun, num, off;
-       struct vop_strategy_args vop_strategy_a;
+       int error, maxrun, num;

 
        ip = VTOI(vp);
        mp = vp->v_mount;
 
        ip = VTOI(vp);
        mp = vp->v_mount;

diff --git a/usr/src/sys/ufs/ufs/ufs_lockf.c b/usr/src/sys/ufs/ufs/ufs_lockf.c
index 7a3964d..6c1e77c 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_lockf.c
+++ b/usr/src/sys/ufs/ufs/ufs_lockf.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_lockf.c 8.1 (Berkeley) %G%
+ *     @(#)ufs_lockf.c 8.2 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -355,7 +355,6 @@ lf_getlock(lock, fl)
        register struct flock *fl;
 {
        register struct lockf *block;
        register struct flock *fl;
 {
        register struct lockf *block;

-       off_t start, end;

 
 #ifdef LOCKF_DEBUG
        if (lockf_debug & 1)
 
 #ifdef LOCKF_DEBUG
        if (lockf_debug & 1)

diff --git a/usr/src/sys/ufs/ufs/ufs_readwrite.c b/usr/src/sys/ufs/ufs/ufs_readwrite.c
index b1868a9..7181817 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_readwrite.c
+++ b/usr/src/sys/ufs/ufs/ufs_readwrite.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_readwrite.c     8.3 (Berkeley) %G%
+ *     @(#)ufs_readwrite.c     8.4 (Berkeley) %G%

  */
 
 #ifdef LFS_READWRITE
  */
 
 #ifdef LFS_READWRITE


@@ -43,7 +43,7 @@ READ(ap)
        daddr_t lbn, nextlbn;
        off_t bytesinfile;
        long size, xfersize, blkoffset;
        daddr_t lbn, nextlbn;
        off_t bytesinfile;
        long size, xfersize, blkoffset;

-       int type, nextsize, error;
+       int nextsize, error;

        u_short mode;
 
        vp = ap->a_vp;
        u_short mode;
 
        vp = ap->a_vp;


@@ -148,7 +148,7 @@ WRITE(ap)
        struct proc *p;
        daddr_t lbn;
        off_t osize;
        struct proc *p;
        daddr_t lbn;
        off_t osize;

-       int blkoffset, error, flags, ioflag, newblock, resid, size, xfersize;
+       int blkoffset, error, flags, ioflag, resid, size, xfersize;

 
        ioflag = ap->a_ioflag;
        uio = ap->a_uio;
 
        ioflag = ap->a_ioflag;
        uio = ap->a_uio;

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index d810873..37ff1a1 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 8.6 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 8.7 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -688,8 +688,6 @@ relookup(dvp, vpp, cnp)
        struct componentname *cnp;
 {
        register struct vnode *dp = 0;  /* the directory we are searching */
        struct componentname *cnp;
 {
        register struct vnode *dp = 0;  /* the directory we are searching */

-       struct vnode *tdp;              /* saved dp */
-       struct mount *mp;               /* mount table entry */

        int docache;                    /* == 0 do not cache last component */
        int wantparent;                 /* 1 => wantparent or lockparent flag */
        int rdonly;                     /* lookup read-only flag bit */
        int docache;                    /* == 0 do not cache last component */
        int wantparent;                 /* 1 => wantparent or lockparent flag */
        int rdonly;                     /* lookup read-only flag bit */


@@ -795,7 +793,6 @@ relookup(dvp, vpp, cnp)
                panic ("relookup: symlink found.\n");
 #endif
 
                panic ("relookup: symlink found.\n");
 #endif
 

-nextname:

        /*
         * Check for read-only file systems.
         */
        /*
         * Check for read-only file systems.
         */


@@ -878,7 +875,6 @@ ufs_rename(ap)
        struct timeval tv;
        int doingdirectory = 0, oldparent = 0, newparent = 0;
        int error = 0;
        struct timeval tv;
        int doingdirectory = 0, oldparent = 0, newparent = 0;
        int error = 0;

-       int fdvpneedsrele = 1, tdvpneedsrele = 1;

        u_char namlen;
 
 #ifdef DIAGNOSTIC
        u_char namlen;
 
 #ifdef DIAGNOSTIC

diff --git a/usr/src/sys/vm/vm_kern.c b/usr/src/sys/vm/vm_kern.c
index 150eaf0..d78c3d1 100644 (file)
--- a/usr/src/sys/vm/vm_kern.c
+++ b/usr/src/sys/vm/vm_kern.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_kern.c   8.1 (Berkeley) %G%
+ *     @(#)vm_kern.c   8.2 (Berkeley) %G%

  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.


@@ -88,7 +88,6 @@ vm_offset_t kmem_alloc(map, size)
        register vm_size_t      size;
 {
        vm_offset_t             addr;
        register vm_size_t      size;
 {
        vm_offset_t             addr;

-       register int            result;

        register vm_offset_t    offset;
        extern vm_object_t      kernel_object;
        vm_offset_t             i;
        register vm_offset_t    offset;
        extern vm_object_t      kernel_object;
        vm_offset_t             i;


@@ -437,7 +436,6 @@ vm_offset_t kmem_alloc_wait(map, size)
        vm_size_t       size;
 {
        vm_offset_t     addr;
        vm_size_t       size;
 {
        vm_offset_t     addr;

-       int             result;

 
        size = round_page(size);
 
 
        size = round_page(size);
 

diff --git a/usr/src/sys/vm/vm_map.c b/usr/src/sys/vm/vm_map.c
index ffb9968..9193182 100644 (file)
--- a/usr/src/sys/vm/vm_map.c
+++ b/usr/src/sys/vm/vm_map.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_map.c    8.1 (Berkeley) %G%
+ *     @(#)vm_map.c    8.2 (Berkeley) %G%

  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.


@@ -198,7 +198,7 @@ vm_map_t vm_map_create(pmap, min, max, pageable)
        boolean_t       pageable;
 {
        register vm_map_t       result;
        boolean_t       pageable;
 {
        register vm_map_t       result;

-       extern vm_map_t         kernel_map, kmem_map;
+       extern vm_map_t         kmem_map;

 
        if (kmem_map == NULL) {
                result = kmap_free;
 
        if (kmem_map == NULL) {
                result = kmap_free;

diff --git a/usr/src/sys/vm/vm_meter.c b/usr/src/sys/vm/vm_meter.c
index 841759b..11b38e5 100644 (file)
--- a/usr/src/sys/vm/vm_meter.c
+++ b/usr/src/sys/vm/vm_meter.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_meter.c  8.3 (Berkeley) %G%
+ *     @(#)vm_meter.c  8.4 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -22,7 +22,6 @@ int   saferss = SAFERSS;
 void
 vmmeter()
 {
 void
 vmmeter()
 {

-       register unsigned *cp, *rp, *sp;

 
        if (time.tv_sec % 5 == 0)
                loadav(&averunnable);
 
        if (time.tv_sec % 5 == 0)
                loadav(&averunnable);

diff --git a/usr/src/sys/vm/vm_pager.c b/usr/src/sys/vm/vm_pager.c
index 7b1315b..f31250f 100644 (file)
--- a/usr/src/sys/vm/vm_pager.c
+++ b/usr/src/sys/vm/vm_pager.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_pager.c  8.4 (Berkeley) %G%
+ *     @(#)vm_pager.c  8.5 (Berkeley) %G%

  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.


@@ -123,7 +123,6 @@ vm_pager_allocate(type, handle, size, prot, off)
        vm_prot_t prot;
        vm_offset_t off;
 {
        vm_prot_t prot;
        vm_offset_t off;
 {

-       vm_pager_t pager;

        struct pagerops *ops;
 
        ops = (type == PG_DFLT) ? dfltpagerops : pagertab[type];
        struct pagerops *ops;
 
        ops = (type == PG_DFLT) ? dfltpagerops : pagertab[type];