lint

SCCS-vsn: sys/kern/kern_physio.c 4.26
SCCS-vsn: sys/kern/vfs_bio.c 4.26
SCCS-vsn: sys/kern/vfs_cluster.c 4.26
SCCS-vsn: sys/vax/vax/cons.c 4.13
SCCS-vsn: sys/vax/uba/dz.c 4.35
SCCS-vsn: sys/kern/tty_pty.c 4.19
SCCS-vsn: sys/vax/if/if_acc.c 4.9
SCCS-vsn: sys/vax/if/if_dmc.c 4.4
SCCS-vsn: sys/vax/if/if_en.c 4.38
SCCS-vsn: sys/deprecated/netimp/if_imp.c 4.14
SCCS-vsn: sys/netinet/in_pcb.c 4.20
SCCS-vsn: sys/deprecated/netpup/pup.h 4.3
SCCS-vsn: sys/net/raw_cb.c 4.5
SCCS-vsn: sys/deprecated/netimp/raw_imp.c 4.8
SCCS-vsn: sys/netinet/raw_ip.c 4.7
SCCS-vsn: sys/deprecated/netpup/raw_pup.c 4.8
SCCS-vsn: sys/net/raw_usrreq.c 4.9
SCCS-vsn: sys/netinet/tcp_debug.c 4.2
SCCS-vsn: sys/netinet/tcp_input.c 1.60
SCCS-vsn: sys/netinet/tcp_output.c 4.33
SCCS-vsn: sys/netinet/tcp_subr.c 4.17
SCCS-vsn: sys/kern/uipc_mbuf.c 1.32
SCCS-vsn: sys/kern/vfs_lookup.c 4.13
SCCS-vsn: sys/ufs/ffs/ufs_lookup.c 4.13
SCCS-vsn: sys/ufs/ufs/ufs_lookup.c 4.13
SCCS-vsn: sys/kern/uipc_pipe.c 4.11
SCCS-vsn: sys/kern/uipc_proto.c 4.18

diff --git a/usr/src/sys/deprecated/netimp/if_imp.c b/usr/src/sys/deprecated/netimp/if_imp.c
index 4ed2c46..c828e1a 100644 (file)
--- a/usr/src/sys/deprecated/netimp/if_imp.c
+++ b/usr/src/sys/deprecated/netimp/if_imp.c
@@ -1,4 +1,4 @@
-/*     if_imp.c        4.13    82/03/12        */
+/*     if_imp.c        4.14    82/03/13        */

 
 #include "imp.h"
 #if NIMP > 0
 
 #include "imp.h"
 #if NIMP > 0


@@ -224,9 +224,10 @@ COUNT(IMPINPUT);
        case IMPTYPE_DOWN:
                if ((ip->il_link & IMP_DMASK) == 0) {
                        sc->imp_state = IMPS_GOINGDOWN;
        case IMPTYPE_DOWN:
                if ((ip->il_link & IMP_DMASK) == 0) {
                        sc->imp_state = IMPS_GOINGDOWN;

-                       timeout(impdown, sc, 30 * hz);
+                       timeout(impdown, (caddr_t)sc, 30 * hz);

                }
                }

-               impmsg(sc, "going down %s", impmessage[ip->il_link&IMP_DMASK]);
+               impmsg(sc, "going down %s",
+                       (u_int)impmessage[ip->il_link&IMP_DMASK]);

                goto rawlinkin;
 
        /*
                goto rawlinkin;
 
        /*


@@ -247,7 +248,7 @@ COUNT(IMPINPUT);
                sin = &sc->imp_if.if_addr;
                sc->imp_if.if_host[0] = sin->s_host = ip->il_host;
                sin->s_imp = ip->il_imp;
                sin = &sc->imp_if.if_addr;
                sc->imp_if.if_host[0] = sin->s_host = ip->il_host;
                sin->s_imp = ip->il_imp;

-               impmsg(sc, "reset (host %d/imp %d)", ip->il_host,
+               impmsg(sc, "reset (host %d/imp %d)", (u_int)ip->il_host,

                        ntohs(ip->il_imp));
                /* restart output in case something was q'd */
                (*sc->imp_cb.ic_start)(sc->imp_if.if_unit);
                        ntohs(ip->il_imp));
                /* restart output in case something was q'd */
                (*sc->imp_cb.ic_start)(sc->imp_if.if_unit);


@@ -264,7 +265,7 @@ COUNT(IMPINPUT);
        case IMPTYPE_INCOMPLETE:
                if (hp && hp->h_rfnm)
                        if (next = hostdeque(hp))
        case IMPTYPE_INCOMPLETE:
                if (hp && hp->h_rfnm)
                        if (next = hostdeque(hp))

-                               (void) impsnd(sc, next);
+                               (void) impsnd(&sc->imp_if, next);

                goto rawlinkin;
 
        /*
                goto rawlinkin;
 
        /*


@@ -330,7 +331,8 @@ COUNT(IMPINPUT);
                impsrc.sin_addr.s_net = ip->il_network;
                impsrc.sin_addr.s_host = ip->il_host;
                impsrc.sin_addr.s_imp = ip->il_imp;
                impsrc.sin_addr.s_net = ip->il_network;
                impsrc.sin_addr.s_host = ip->il_host;
                impsrc.sin_addr.s_imp = ip->il_imp;

-               raw_input(m, &impproto, &impdst, &impsrc);
+               raw_input(m, &impproto, (struct sockaddr *)&impdst,
+                 (struct sockaddr *)&impsrc);

                return;
        }
        IF_ENQUEUE(inq, m);
                return;
        }
        IF_ENQUEUE(inq, m);


@@ -355,6 +357,7 @@ impdown(sc)
 impmsg(sc, fmt, a1, a2)
        struct imp_softc *sc;
        char *fmt;
 impmsg(sc, fmt, a1, a2)
        struct imp_softc *sc;
        char *fmt;

+       u_int a1;

 {
        printf("imp%d: ", sc->imp_if.if_unit);
        printf(fmt, a1, a2);
 {
        printf("imp%d: ", sc->imp_if.if_unit);
        printf(fmt, a1, a2);


@@ -392,7 +395,7 @@ COUNT(IMPOUTPUT);
                dhost = ip->ip_dst.s_host;
                dimp = ip->ip_dst.s_imp;
                dlink = IMPLINK_IP;
                dhost = ip->ip_dst.s_host;
                dimp = ip->ip_dst.s_imp;
                dlink = IMPLINK_IP;

-               len = ntohs(ip->ip_len);
+               len = ntohs((u_short)ip->ip_len);

                break;
        }
 #endif
                break;
        }
 #endif


@@ -427,7 +430,8 @@ COUNT(IMPOUTPUT);
        imp->il_network = 0;
        imp->il_host = dhost;
        imp->il_imp = dimp;
        imp->il_network = 0;
        imp->il_host = dhost;
        imp->il_imp = dimp;

-       imp->il_length = htons((len + sizeof(struct imp_leader)) << 3);
+       imp->il_length =
+               htons((u_short)(len + sizeof(struct imp_leader)) << 3);

        imp->il_link = dlink;
        imp->il_flags = imp->il_htype = imp->il_subtype = 0;
 
        imp->il_link = dlink;
        imp->il_flags = imp->il_htype = imp->il_subtype = 0;
 

diff --git a/usr/src/sys/deprecated/netimp/raw_imp.c b/usr/src/sys/deprecated/netimp/raw_imp.c
index f59b655..6547546 100644 (file)
--- a/usr/src/sys/deprecated/netimp/raw_imp.c
+++ b/usr/src/sys/deprecated/netimp/raw_imp.c
@@ -1,4 +1,4 @@
-/*     raw_imp.c       4.7     82/03/05        */
+/*     raw_imp.c       4.8     82/03/13        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"


@@ -71,7 +71,7 @@ COUNT(RIMP_OUTPUT);
         */
        for (len = 0, n = m; n; n = n->m_next)
                len += n->m_len;
         */
        for (len = 0, n = m; n; n = n->m_next)
                len += n->m_len;

-       ip->il_length = htons(len << 3);
+       ip->il_length = htons((u_short)(len << 3));

        sin = (struct sockaddr_in *)&rp->rcb_addr;
        ip->il_network = sin->sin_addr.s_net;
        ip->il_host = sin->sin_addr.s_host;
        sin = (struct sockaddr_in *)&rp->rcb_addr;
        ip->il_network = sin->sin_addr.s_net;
        ip->il_host = sin->sin_addr.s_host;

diff --git a/usr/src/sys/deprecated/netpup/pup.h b/usr/src/sys/deprecated/netpup/pup.h
index 3cd43de..f932c30 100644 (file)
--- a/usr/src/sys/deprecated/netpup/pup.h
+++ b/usr/src/sys/deprecated/netpup/pup.h
@@ -1,4 +1,4 @@
-/*     pup.h   4.2     82/03/03        */
+/*     pup.h   4.3     82/03/13        */

 
 /*
  * PUP port addressing.
 
 /*
  * PUP port addressing.


@@ -37,3 +37,7 @@ struct sockaddr_pup {
        struct  pupport spup_addr;
        char    spup_zero2[4];
 };
        struct  pupport spup_addr;
        char    spup_zero2[4];
 };

+
+#define        sp_net          spup_addr.pp_net
+#define        sp_host         spup_addr.pp_host
+#define        sp_socket       spup_addr.pp_port

diff --git a/usr/src/sys/deprecated/netpup/raw_pup.c b/usr/src/sys/deprecated/netpup/raw_pup.c
index 56d2a4a..6bfe50d 100644 (file)
--- a/usr/src/sys/deprecated/netpup/raw_pup.c
+++ b/usr/src/sys/deprecated/netpup/raw_pup.c
@@ -1,4 +1,4 @@
-/*     raw_pup.c       4.7     82/03/10        */
+/*     raw_pup.c       4.8     82/03/13        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"


@@ -36,6 +36,7 @@ rpup_output(m, so)
        int len;
        struct mbuf *n;
        struct sockaddr_pup *spup;
        int len;
        struct mbuf *n;
        struct sockaddr_pup *spup;

+       struct in_addr in;

        struct ifnet *ifp;
 
 COUNT(RPUP_OUTPUT);
        struct ifnet *ifp;
 
 COUNT(RPUP_OUTPUT);


@@ -54,23 +55,17 @@ COUNT(RPUP_OUTPUT);
        for (len = 0, n = m; n; n = n->m_next)
                len += n->m_len;
        pup->pup_length = len;
        for (len = 0, n = m; n; n = n->m_next)
                len += n->m_len;
        pup->pup_length = len;

-       spup = (struct sockaddr_pup *)&rp->rcb_addr;
-       pup->pup_dport = spup->spup_addr;
-
-       /*
-        * Insure proper source address is included.
-        */

        spup = (struct sockaddr_pup *)&(rp->rcb_socket->so_addr);
        pup->pup_sport = spup->spup_addr;
        /* for now, assume user generates PUP checksum. */
        spup = (struct sockaddr_pup *)&(rp->rcb_socket->so_addr);
        pup->pup_sport = spup->spup_addr;
        /* for now, assume user generates PUP checksum. */

+       spup = (struct sockaddr_pup *)&rp->rcb_addr;
+       pup->pup_dport = spup->spup_addr;

 
 

-       ifp = if_ifonnetof(&rp->rcb_addr);
-       if (ifp == 0) {
-               ifp = if_gatewayfor(&rp->rcb_addr);
-               if (ifp == 0)
-                       goto bad;
-       }
-       return (enoutput((struct ifnet *)rp->rcb_pcb, m, PF_PUP));
+       in.s_net = spup->spup_addr.pp_net;
+       ifp = if_ifonnetof(in);
+       if (ifp == 0)
+               goto bad;
+       return (enoutput(ifp, m, PF_PUP));

 
 bad:
        m_freem(m);
 
 bad:
        m_freem(m);

diff --git a/usr/src/sys/kern/kern_physio.c b/usr/src/sys/kern/kern_physio.c
index e5d3a5f..aae8cdc 100644 (file)
--- a/usr/src/sys/kern/kern_physio.c
+++ b/usr/src/sys/kern/kern_physio.c
@@ -1,4 +1,4 @@
-/*     kern_physio.c   4.25    82/01/17        */
+/*     kern_physio.c   4.26    82/03/13        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -85,11 +85,11 @@ int *swpf;
 #ifndef        UNFAST
 #define        notavail(bp) \
 { \
 #ifndef        UNFAST
 #define        notavail(bp) \
 { \

-       int s = spl6(); \
+       int x = spl6(); \

        (bp)->av_back->av_forw = (bp)->av_forw; \
        (bp)->av_forw->av_back = (bp)->av_back; \
        (bp)->b_flags |= B_BUSY; \
        (bp)->av_back->av_forw = (bp)->av_forw; \
        (bp)->av_forw->av_back = (bp)->av_back; \
        (bp)->b_flags |= B_BUSY; \

-       splx(s); \
+       splx(x); \

 }
 #endif
 
 }
 #endif
 

diff --git a/usr/src/sys/kern/tty_pty.c b/usr/src/sys/kern/tty_pty.c
index acd8eaa..f16c438 100644 (file)
--- a/usr/src/sys/kern/tty_pty.c
+++ b/usr/src/sys/kern/tty_pty.c
@@ -1,4 +1,4 @@
-/*     tty_pty.c       4.18    82/03/11        */
+/*     tty_pty.c       4.19    82/03/13        */

 
 /*
  * Pseudo-teletype Driver
 
 /*
  * Pseudo-teletype Driver


@@ -219,11 +219,11 @@ ptcread(dev)
        pti = &pt_ioctl[minor(dev)];
        if (pti->pt_flags & PF_PKT) {
                if (pti->pt_send) {
        pti = &pt_ioctl[minor(dev)];
        if (pti->pt_flags & PF_PKT) {
                if (pti->pt_send) {

-                       passc(pti->pt_send);
+                       (void) passc(pti->pt_send);

                        pti->pt_send = 0;
                        return;
                }
                        pti->pt_send = 0;
                        return;
                }

-               passc(0);
+               (void) passc(0);

        }
        while (tp->t_outq.c_cc == 0 || (tp->t_state&TS_TTSTOP)) {
                if (pti->pt_flags&PF_NBIO) {
        }
        while (tp->t_outq.c_cc == 0 || (tp->t_state&TS_TTSTOP)) {
                if (pti->pt_flags&PF_NBIO) {


@@ -335,8 +335,8 @@ again:
                                sleep((caddr_t)&tp->t_rawq.c_cf, TTOPRI);
                                goto again;
                        }
                                sleep((caddr_t)&tp->t_rawq.c_cf, TTOPRI);
                                goto again;
                        }

-                       b_to_q(cp, cc, &tp->t_rawq);
-                       putc(0, &tp->t_rawq);
+                       (void) b_to_q(cp, cc, &tp->t_rawq);
+                       (void) putc(0, &tp->t_rawq);

                        wakeup((caddr_t)&tp->t_rawq);
                        return;
                }
                        wakeup((caddr_t)&tp->t_rawq);
                        return;
                }


@@ -372,7 +372,7 @@ ptyioctl(dev, cmd, addr, flag)
        if (cdevsw[major(dev)].d_open == ptcopen) {
                if (cmd == TIOCPKT) {
                        int packet;
        if (cdevsw[major(dev)].d_open == ptcopen) {
                if (cmd == TIOCPKT) {
                        int packet;

-                       if (copyin((caddr_t)addr, &packet, sizeof (packet))) {
+                       if (copyin((caddr_t)addr, (caddr_t)&packet, sizeof (packet))) {

                                u.u_error = EFAULT;
                                return;
                        }
                                u.u_error = EFAULT;
                                return;
                        }


@@ -384,7 +384,7 @@ ptyioctl(dev, cmd, addr, flag)
                }
                if (cmd == TIOCREMOTE) {
                        int remote;
                }
                if (cmd == TIOCREMOTE) {
                        int remote;

-                       if (copyin((caddr_t)addr, &remote, sizeof (remote))) {
+                       if (copyin((caddr_t)addr, (caddr_t)&remote, sizeof (remote))) {

                                u.u_error = EFAULT;
                                return;
                        }
                                u.u_error = EFAULT;
                                return;
                        }


@@ -397,7 +397,7 @@ ptyioctl(dev, cmd, addr, flag)
                }
                if (cmd == FIONBIO) {
                        int nbio;
                }
                if (cmd == FIONBIO) {
                        int nbio;

-                       if (copyin(addr, &nbio, sizeof (nbio))) {
+                       if (copyin((caddr_t)addr, (caddr_t)&nbio, sizeof (nbio))) {

                                u.u_error = EFAULT;
                                return;
                        }
                                u.u_error = EFAULT;
                                return;
                        }

diff --git a/usr/src/sys/kern/uipc_mbuf.c b/usr/src/sys/kern/uipc_mbuf.c
index d21c4d0..266bd77 100644 (file)
--- a/usr/src/sys/kern/uipc_mbuf.c
+++ b/usr/src/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/*     uipc_mbuf.c     1.31    82/03/12        */
+/*     uipc_mbuf.c     1.32    82/03/13        */

 
 #include "../h/param.h"
 #include "../h/dir.h"
 
 #include "../h/param.h"
 #include "../h/dir.h"


@@ -326,7 +326,7 @@ m_pullup(m0, len)
        int len;
 {
        register struct mbuf *m, *n;
        int len;
 {
        register struct mbuf *m, *n;

-       int cnt;
+       int count;

 
        n = m0;
        if (len > MLEN)
 
        n = m0;
        if (len > MLEN)


@@ -337,14 +337,15 @@ m_pullup(m0, len)
        m->m_off = MMINOFF;
        m->m_len = 0;
        do {
        m->m_off = MMINOFF;
        m->m_len = 0;
        do {

-               cnt = MIN(MLEN - m->m_len, len);
-               if (cnt > n->m_len)
-                       cnt = n->m_len;
-               bcopy(mtod(n, caddr_t), mtod(m, caddr_t)+m->m_len, cnt);
-               len -= cnt;
-               m->m_len += cnt;
-               n->m_off += cnt;
-               n->m_len -= cnt;
+               count = MIN(MLEN - m->m_len, len);
+               if (count > n->m_len)
+                       count = n->m_len;
+               bcopy(mtod(n, caddr_t), mtod(m, caddr_t)+m->m_len,
+                 (unsigned)count);
+               len -= count;
+               m->m_len += count;
+               n->m_off += count;
+               n->m_len -= count;

                if (n->m_len)
                        break;
                n = m_free(n);
                if (n->m_len)
                        break;
                n = m_free(n);

diff --git a/usr/src/sys/kern/uipc_pipe.c b/usr/src/sys/kern/uipc_pipe.c
index f1aa97c..2b0cc98 100644 (file)
--- a/usr/src/sys/kern/uipc_pipe.c
+++ b/usr/src/sys/kern/uipc_pipe.c
@@ -1,4 +1,4 @@
-/*     uipc_pipe.c     4.10    81/12/02        */
+/*     uipc_pipe.c     4.11    82/03/13        */

 
 #include "../h/param.h"
 #include "../h/dir.h"
 
 #include "../h/param.h"
 #include "../h/dir.h"


@@ -139,6 +139,7 @@ COUNT(PIUSRREQ);
        return (0);
 }
 
        return (0);
 }
 

+#ifdef notdef

 psndrcv(snd, rcv)
        struct sockbuf *snd, *rcv;
 {
 psndrcv(snd, rcv)
        struct sockbuf *snd, *rcv;
 {


@@ -150,3 +151,4 @@ psndrcv(snd, rcv)
            rcv->sb_cc, rcv->sb_hiwat, rcv->sb_mbcnt, rcv->sb_mbmax);
        printf("m %x, m->m_len %d\n", rcv->sb_mb, rcv->sb_mb ? rcv->sb_mb->m_len : 0);
 }
            rcv->sb_cc, rcv->sb_hiwat, rcv->sb_mbcnt, rcv->sb_mbmax);
        printf("m %x, m->m_len %d\n", rcv->sb_mb, rcv->sb_mb ? rcv->sb_mb->m_len : 0);
 }

+#endif

diff --git a/usr/src/sys/kern/uipc_proto.c b/usr/src/sys/kern/uipc_proto.c
index 634b5be..9e04000 100644 (file)
--- a/usr/src/sys/kern/uipc_proto.c
+++ b/usr/src/sys/kern/uipc_proto.c
@@ -1,4 +1,4 @@
-/*     uipc_proto.c    4.17    82/03/03        */
+/*     uipc_proto.c    4.18    82/03/13        */

 
 #include "../h/param.h"
 #include "../h/socket.h"
 
 #include "../h/param.h"
 #include "../h/socket.h"


@@ -31,8 +31,7 @@ int   udp_init();
 int    tcp_input(),tcp_ctlinput();
 int    tcp_usrreq();
 int    tcp_init(),tcp_fasttimo(),tcp_slowtimo(),tcp_drain();
 int    tcp_input(),tcp_ctlinput();
 int    tcp_usrreq();
 int    tcp_init(),tcp_fasttimo(),tcp_slowtimo(),tcp_drain();

-int    rip_input(),rip_output(),rip_ctlinput();
-int    rip_usrreq(),rip_slowtimo();
+int    rip_input(),rip_output(),rip_ctlinput(),rip_usrreq();

 
 /*
  * IMP protocol family: raw interface
 
 /*
  * IMP protocol family: raw interface

diff --git a/usr/src/sys/kern/vfs_bio.c b/usr/src/sys/kern/vfs_bio.c
index 798643d..0740975 100644 (file)
--- a/usr/src/sys/kern/vfs_bio.c
+++ b/usr/src/sys/kern/vfs_bio.c
@@ -1,4 +1,4 @@
-/*     vfs_bio.c       4.25    82/01/17        */
+/*     vfs_bio.c       4.26    82/03/13        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -85,11 +85,11 @@ int *swpf;
 #ifndef        UNFAST
 #define        notavail(bp) \
 { \
 #ifndef        UNFAST
 #define        notavail(bp) \
 { \

-       int s = spl6(); \
+       int x = spl6(); \

        (bp)->av_back->av_forw = (bp)->av_forw; \
        (bp)->av_forw->av_back = (bp)->av_back; \
        (bp)->b_flags |= B_BUSY; \
        (bp)->av_back->av_forw = (bp)->av_forw; \
        (bp)->av_forw->av_back = (bp)->av_back; \
        (bp)->b_flags |= B_BUSY; \

-       splx(s); \
+       splx(x); \

 }
 #endif
 
 }
 #endif
 

diff --git a/usr/src/sys/kern/vfs_cluster.c b/usr/src/sys/kern/vfs_cluster.c
index b1a251b..6250812 100644 (file)
--- a/usr/src/sys/kern/vfs_cluster.c
+++ b/usr/src/sys/kern/vfs_cluster.c
@@ -1,4 +1,4 @@
-/*     vfs_cluster.c   4.25    82/01/17        */
+/*     vfs_cluster.c   4.26    82/03/13        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -85,11 +85,11 @@ int *swpf;
 #ifndef        UNFAST
 #define        notavail(bp) \
 { \
 #ifndef        UNFAST
 #define        notavail(bp) \
 { \

-       int s = spl6(); \
+       int x = spl6(); \

        (bp)->av_back->av_forw = (bp)->av_forw; \
        (bp)->av_forw->av_back = (bp)->av_back; \
        (bp)->b_flags |= B_BUSY; \
        (bp)->av_back->av_forw = (bp)->av_forw; \
        (bp)->av_forw->av_back = (bp)->av_back; \
        (bp)->b_flags |= B_BUSY; \

-       splx(s); \
+       splx(x); \

 }
 #endif
 
 }
 #endif
 

diff --git a/usr/src/sys/kern/vfs_lookup.c b/usr/src/sys/kern/vfs_lookup.c
index b7583b0..375d668 100644 (file)
--- a/usr/src/sys/kern/vfs_lookup.c
+++ b/usr/src/sys/kern/vfs_lookup.c
@@ -1,4 +1,4 @@
-/*     vfs_lookup.c    4.12    82/03/12        */
+/*     vfs_lookup.c    4.13    82/03/13        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -200,14 +200,16 @@ dirloop:
                                iput(pdp);
                                goto out;
                        }
                                iput(pdp);
                                goto out;
                        }

-                       bcopy(ocp, nbp->b_un.b_addr+dp->i_size, cp-ocp);
+                       bcopy(ocp, nbp->b_un.b_addr+dp->i_size,
+                         (unsigned)(cp-ocp));

                        bp = bread(dp->i_dev, bmap(dp, (daddr_t)0, B_READ));
                        if (bp->b_flags & B_ERROR) {
                                brelse(bp);
                                iput(pdp);
                                goto out;
                        }
                        bp = bread(dp->i_dev, bmap(dp, (daddr_t)0, B_READ));
                        if (bp->b_flags & B_ERROR) {
                                brelse(bp);
                                iput(pdp);
                                goto out;
                        }

-                       bcopy(bp->b_un.b_addr, nbp->b_un.b_addr, dp->i_size);
+                       bcopy(bp->b_un.b_addr, nbp->b_un.b_addr,
+                         (unsigned)dp->i_size);

                        brelse(bp);
                        cp = nbp->b_un.b_addr;
                        iput(dp);
                        brelse(bp);
                        cp = nbp->b_un.b_addr;
                        iput(dp);

diff --git a/usr/src/sys/net/raw_cb.c b/usr/src/sys/net/raw_cb.c
index c132542..ead8a1d 100644 (file)
--- a/usr/src/sys/net/raw_cb.c
+++ b/usr/src/sys/net/raw_cb.c
@@ -1,4 +1,4 @@
-/*     raw_cb.c        4.4     82/03/05        */
+/*     raw_cb.c        4.5     82/03/13        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -73,7 +73,7 @@ COUNT(RAW_ATTACH);
        rp->rcb_pcb = 0;
 
        if (addr)
        rp->rcb_pcb = 0;
 
        if (addr)

-               bcopy(addr, &so->so_addr, sizeof(*addr));
+               bcopy((caddr_t)addr, (caddr_t)&so->so_addr, sizeof(*addr));

        return (0);
 bad2:
        sbrelease(&so->so_snd);
        return (0);
 bad2:
        sbrelease(&so->so_snd);


@@ -95,7 +95,7 @@ COUNT(RAW_DETACH);
        so->so_pcb = 0;
        sofree(so);
        remque(rp);
        so->so_pcb = 0;
        sofree(so);
        remque(rp);

-       (void) m_freem(dtom(rp));
+       m_freem(dtom(rp));

 }
 
 /*
 }
 
 /*


@@ -119,6 +119,6 @@ raw_connaddr(rp, addr)
        struct sockaddr *addr;
 {
 COUNT(RAW_CONNADDR);
        struct sockaddr *addr;
 {
 COUNT(RAW_CONNADDR);

-       bcopy(addr, &rp->rcb_addr, sizeof(struct sockaddr));
+       bcopy((caddr_t)addr, (caddr_t)&rp->rcb_addr, sizeof(struct sockaddr));

        rp->rcb_flags |= RAW_ADDR;
 }
        rp->rcb_flags |= RAW_ADDR;
 }

diff --git a/usr/src/sys/net/raw_usrreq.c b/usr/src/sys/net/raw_usrreq.c
index d19f471..5dbdd02 100644 (file)
--- a/usr/src/sys/net/raw_usrreq.c
+++ b/usr/src/sys/net/raw_usrreq.c
@@ -1,4 +1,4 @@
-/*     raw_usrreq.c    4.8     82/03/05        */
+/*     raw_usrreq.c    4.9     82/03/13        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"


@@ -128,7 +128,7 @@ next:
                if (last) {
                        struct mbuf *n;
 
                if (last) {
                        struct mbuf *n;
 

-                       if (n = m_copy(m->m_next, 0, M_COPYALL))
+                       if (n = m_copy(m->m_next, 0, (int)M_COPYALL))

                                goto nospace;
                        if (sbappendaddr(&last->so_rcv, &rawp->raw_src, n) == 0) {
                                /*
                                goto nospace;
                        if (sbappendaddr(&last->so_rcv, &rawp->raw_src, n) == 0) {
                                /*

diff --git a/usr/src/sys/netinet/in_pcb.c b/usr/src/sys/netinet/in_pcb.c
index a2ea154..d07179a 100644 (file)
--- a/usr/src/sys/netinet/in_pcb.c
+++ b/usr/src/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-/*     in_pcb.c        4.19    82/03/11        */
+/*     in_pcb.c        4.20    82/03/13        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -69,7 +69,7 @@ COUNT(IN_PCBATTACH);
                if (sin->sin_family != AF_INET)
                        return (EAFNOSUPPORT);
                if (sin->sin_addr.s_addr &&
                if (sin->sin_family != AF_INET)
                        return (EAFNOSUPPORT);
                if (sin->sin_addr.s_addr &&

-                   if_ifwithaddr(sin->sin_addr.s_addr) == 0)
+                   if_ifwithaddr(sin->sin_addr) == 0)

                        return (EADDRNOTAVAIL);
                lport = sin->sin_port;
                if (lport) {
                        return (EADDRNOTAVAIL);
                lport = sin->sin_port;
                if (lport) {


@@ -138,7 +138,7 @@ COUNT(IN_PCBCONNECT);
        if (sin->sin_addr.s_addr == 0 || sin->sin_port == 0)
                return (EADDRNOTAVAIL);
        if (inp->inp_laddr.s_addr == 0) {
        if (sin->sin_addr.s_addr == 0 || sin->sin_port == 0)
                return (EADDRNOTAVAIL);
        if (inp->inp_laddr.s_addr == 0) {

-               ifp = if_ifonnetof(sin->sin_addr.s_addr);
+               ifp = if_ifonnetof(sin->sin_addr);

                if (ifp == 0)
                        ifp = ifnet;
        }
                if (ifp == 0)
                        ifp = ifnet;
        }

diff --git a/usr/src/sys/netinet/raw_ip.c b/usr/src/sys/netinet/raw_ip.c
index a8aee7c..7e4df61 100644 (file)
--- a/usr/src/sys/netinet/raw_ip.c
+++ b/usr/src/sys/netinet/raw_ip.c
@@ -1,4 +1,4 @@
-/*     raw_ip.c        4.6     82/03/12        */
+/*     raw_ip.c        4.7     82/03/13        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"


@@ -34,7 +34,8 @@ COUNT(RIP_INPUT);
        ripproto.sp_protocol = ip->ip_p;
        ripdst.sin_addr = ip->ip_dst;
        ripsrc.sin_addr = ip->ip_src;
        ripproto.sp_protocol = ip->ip_p;
        ripdst.sin_addr = ip->ip_dst;
        ripsrc.sin_addr = ip->ip_src;

-       raw_input(m, &ripproto, &ripdst, &ripsrc);
+       raw_input(m, &ripproto, (struct sockaddr *)&ripdst,
+         (struct sockaddr *)&ripsrc);

 }
 
 /*ARGSUSED*/
 }
 
 /*ARGSUSED*/


@@ -84,7 +85,7 @@ COUNT(RIP_OUTPUT);
        ip->ip_src =
                ((struct sockaddr_in *)&so->so_addr)->sin_addr;
        ip->ip_ttl = MAXTTL;
        ip->ip_src =
                ((struct sockaddr_in *)&so->so_addr)->sin_addr;
        ip->ip_ttl = MAXTTL;

-       return (ip_output(m, 0));
+       return (ip_output(m, (struct mbuf *)0));

 }
 
 /*
 }
 
 /*

diff --git a/usr/src/sys/netinet/tcp_debug.c b/usr/src/sys/netinet/tcp_debug.c
index 3724f6c..b9fc28b 100644 (file)
--- a/usr/src/sys/netinet/tcp_debug.c
+++ b/usr/src/sys/netinet/tcp_debug.c
@@ -1,4 +1,4 @@
-/*     tcp_debug.c     4.1     81/12/22        */
+/*     tcp_debug.c     4.2     82/03/13        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -37,7 +37,6 @@ tcp_trace(act, ostate, tp, ti, req)
 {
        tcp_seq seq, ack;
        int len, flags;
 {
        tcp_seq seq, ack;
        int len, flags;

-       char *cp;

        struct tcp_debug *td = &tcp_debug[tcp_debx++];
 
        if (tcp_debx == TCP_NDEBUG)
        struct tcp_debug *td = &tcp_debug[tcp_debx++];
 
        if (tcp_debx == TCP_NDEBUG)


@@ -73,7 +72,7 @@ tcp_trace(act, ostate, tp, ti, req)
                if (act == TA_OUTPUT) {
                        seq = ntohl(seq);
                        ack = ntohl(ack);
                if (act == TA_OUTPUT) {
                        seq = ntohl(seq);
                        ack = ntohl(ack);

-                       len = ntohs(len);
+                       len = ntohs((u_short)len);

                }
 #endif
                if (act == TA_OUTPUT)
                }
 #endif
                if (act == TA_OUTPUT)


@@ -85,9 +84,11 @@ tcp_trace(act, ostate, tp, ti, req)
                printf("@%x", ack);
                flags = ti->ti_flags;
                if (flags) {
                printf("@%x", ack);
                flags = ti->ti_flags;
                if (flags) {

+#ifndef lint

                        char *cp = "<";
 #define pf(f) { if (ti->ti_flags&TH_/**/f) { printf("%s%s", cp, "f"); cp = ","; } }
                        pf(SYN); pf(ACK); pf(FIN); pf(RST);
                        char *cp = "<";
 #define pf(f) { if (ti->ti_flags&TH_/**/f) { printf("%s%s", cp, "f"); cp = ","; } }
                        pf(SYN); pf(ACK); pf(FIN); pf(RST);

+#endif

                        printf(">");
                }
                break;
                        printf(">");
                }
                break;

diff --git a/usr/src/sys/netinet/tcp_input.c b/usr/src/sys/netinet/tcp_input.c
index 807e0ca..cf96e45 100644 (file)
--- a/usr/src/sys/netinet/tcp_input.c
+++ b/usr/src/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/*     tcp_input.c     1.59    82/03/11        */
+/*     tcp_input.c     1.60    82/03/13        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -21,7 +21,9 @@
 #include "../net/tcp_debug.h"
 #include "../errno.h"
 
 #include "../net/tcp_debug.h"
 #include "../errno.h"
 

+#ifdef notdef

 int    tcpprintfs = 0;
 int    tcpprintfs = 0;

+#endif

 int    tcpcksum = 1;
 struct sockaddr_in tcp_in = { AF_INET };
 struct tcpiphdr tcp_saveti;
 int    tcpcksum = 1;
 struct sockaddr_in tcp_in = { AF_INET };
 struct tcpiphdr tcp_saveti;


@@ -74,7 +76,7 @@ COUNT(TCP_INPUT);
                ti->ti_x1 = 0;
                ti->ti_len = (u_short)tlen;
 #if vax
                ti->ti_x1 = 0;
                ti->ti_len = (u_short)tlen;
 #if vax

-               ti->ti_len = htons(ti->ti_len);
+               ti->ti_len = htons((u_short)ti->ti_len);

 #endif
                if (ti->ti_sum = in_cksum(m, len)) {
                        tcpstat.tcps_badsum++;
 #endif
                if (ti->ti_sum = in_cksum(m, len)) {
                        tcpstat.tcps_badsum++;


@@ -105,9 +107,10 @@ COUNT(TCP_INPUT);
                om->m_off = MMINOFF;
                om->m_len = off - sizeof (struct tcphdr);
                { caddr_t op = mtod(m, caddr_t) + sizeof (struct tcpiphdr);
                om->m_off = MMINOFF;
                om->m_len = off - sizeof (struct tcphdr);
                { caddr_t op = mtod(m, caddr_t) + sizeof (struct tcpiphdr);

-                 bcopy(op, mtod(om, caddr_t), om->m_len);
+                 bcopy(op, mtod(om, caddr_t), (unsigned)om->m_len);

                  m->m_len -= om->m_len;
                  m->m_len -= om->m_len;

-                 bcopy(op+om->m_len, op, m->m_len-sizeof (struct tcpiphdr));
+                 bcopy(op+om->m_len, op,
+                  (unsigned)(m->m_len-sizeof (struct tcpiphdr)));

                }
        }
        tiflags = ti->ti_flags;
                }
        }
        tiflags = ti->ti_flags;


@@ -201,7 +204,7 @@ COUNT(TCP_INPUT);
                laddr = inp->inp_laddr;
                if (inp->inp_laddr.s_addr == 0)
                        inp->inp_laddr = ti->ti_dst;
                laddr = inp->inp_laddr;
                if (inp->inp_laddr.s_addr == 0)
                        inp->inp_laddr = ti->ti_dst;

-               if (in_pcbconnect(inp, (struct sockaddr *)&tcp_in)) {
+               if (in_pcbconnect(inp, (struct sockaddr_in *)&tcp_in)) {

                        inp->inp_laddr = laddr;
                        goto drop;
                }
                        inp->inp_laddr = laddr;
                        goto drop;
                }


@@ -483,7 +486,7 @@ trimthenstep6:
                        sbdrop(&so->so_snd, so->so_snd.sb_cc);
                        tp->snd_wnd -= so->so_snd.sb_cc;
                } else {
                        sbdrop(&so->so_snd, so->so_snd.sb_cc);
                        tp->snd_wnd -= so->so_snd.sb_cc;
                } else {

-                       sbdrop(&so->so_snd.sb_cc, acked);
+                       sbdrop(&so->so_snd, acked);

                        tp->snd_wnd -= acked;
                        acked = 0;
                }
                        tp->snd_wnd -= acked;
                        acked = 0;
                }


@@ -673,7 +676,7 @@ step6:
        /*
         * Return any desired output.
         */
        /*
         * Return any desired output.
         */

-       tcp_output(tp);
+       (void) tcp_output(tp);

        return;
 
 dropafterack:
        return;
 
 dropafterack:


@@ -688,7 +691,7 @@ dropafterack:
 
 dropwithreset:
        if (om)
 
 dropwithreset:
        if (om)

-               m_free(om);
+               (void) m_free(om);

        /*
         * Generate a RST, dropping incoming segment.
         * Make ACK acceptable to originator of segment.
        /*
         * Generate a RST, dropping incoming segment.
         * Make ACK acceptable to originator of segment.


@@ -739,7 +742,7 @@ tcp_dooptions(tp, om)
                                continue;
                        tp->t_maxseg = *(u_short *)(cp + 2);
 #if vax
                                continue;
                        tp->t_maxseg = *(u_short *)(cp + 2);
 #if vax

-                       tp->t_maxseg = ntohs(tp->t_maxseg);
+                       tp->t_maxseg = ntohs((u_short)tp->t_maxseg);

 #endif
                        break;
                        
 #endif
                        break;
                        


@@ -796,7 +799,7 @@ printf("take oob ack %x and cancel rexmt\n", cp[2]);
 #endif TCPTRUEOOB
                }
        }
 #endif TCPTRUEOOB
                }
        }

-       m_free(om);
+       (void) m_free(om);

 }
 
 /*
 }
 
 /*


@@ -820,7 +823,7 @@ tcp_pulloutofband(so, ti)
 
                        tp->t_iobc = *cp;
                        tp->t_oobflags |= TCPOOB_HAVEDATA;
 
                        tp->t_iobc = *cp;
                        tp->t_oobflags |= TCPOOB_HAVEDATA;

-                       bcopy(cp+1, cp, m->m_len - cnt - 1);
+                       bcopy(cp+1, cp, (unsigned)(m->m_len - cnt - 1));

                        m->m_len--;
                        return;
                }
                        m->m_len--;
                        return;
                }


@@ -926,7 +929,7 @@ present:
                m = dtom(ti);
                ti = (struct tcpiphdr *)ti->ti_next;
                if (so->so_state & SS_CANTRCVMORE)
                m = dtom(ti);
                ti = (struct tcpiphdr *)ti->ti_next;
                if (so->so_state & SS_CANTRCVMORE)

-                       (void) m_freem(m);
+                       m_freem(m);

                else
                        sbappend(&so->so_rcv, m);
        } while (ti != (struct tcpiphdr *)tp && ti->ti_seq == tp->rcv_nxt);
                else
                        sbappend(&so->so_rcv, m);
        } while (ti != (struct tcpiphdr *)tp && ti->ti_seq == tp->rcv_nxt);

diff --git a/usr/src/sys/netinet/tcp_output.c b/usr/src/sys/netinet/tcp_output.c
index 2c762fd..919407d 100644 (file)
--- a/usr/src/sys/netinet/tcp_output.c
+++ b/usr/src/sys/netinet/tcp_output.c
@@ -1,4 +1,4 @@
-/*     tcp_output.c    4.32    82/03/12        */
+/*     tcp_output.c    4.33    82/03/13        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -166,7 +166,7 @@ send:
                m0 = m->m_next;
                m0->m_off = MMINOFF;
                m0->m_len = optlen;
                m0 = m->m_next;
                m0->m_off = MMINOFF;
                m0->m_len = optlen;

-               bcopy(opt, mtod(m0, caddr_t), optlen);
+               bcopy((caddr_t)opt, mtod(m0, caddr_t), optlen);

                opt = (u_char *)(mtod(m0, caddr_t) + optlen);
 #ifdef TCPTRUEOOB
                if (tp->t_oobflags&TCPOOB_OWEACK) {
                opt = (u_char *)(mtod(m0, caddr_t) + optlen);
 #ifdef TCPTRUEOOB
                if (tp->t_oobflags&TCPOOB_OWEACK) {


@@ -231,7 +231,7 @@ noopt:
                ti->ti_len = htons((u_short)ti->ti_len);
 #endif
        }
                ti->ti_len = htons((u_short)ti->ti_len);
 #endif
        }

-       ti->ti_sum = in_cksum(m, sizeof (struct tcpiphdr) + optlen + len);
+       ti->ti_sum = in_cksum(m, sizeof (struct tcpiphdr) + (int)optlen + len);

 
        /*
         * Advance snd_nxt over sequence space of this segment
 
        /*
         * Advance snd_nxt over sequence space of this segment

diff --git a/usr/src/sys/netinet/tcp_subr.c b/usr/src/sys/netinet/tcp_subr.c
index 926b5d3..5daa21a 100644 (file)
--- a/usr/src/sys/netinet/tcp_subr.c
+++ b/usr/src/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/*     tcp_subr.c      4.16    82/03/11        */
+/*     tcp_subr.c      4.17    82/03/13        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -124,7 +124,7 @@ COUNT(TCP_RESPOND);
        ti->ti_seq = seq;
        ti->ti_ack = ack;
 #if vax
        ti->ti_seq = seq;
        ti->ti_ack = ack;
 #if vax

-       ti->ti_len = htons(ti->ti_len);
+       ti->ti_len = htons((u_short)ti->ti_len);

        ti->ti_seq = htonl(ti->ti_seq);
        ti->ti_ack = htonl(ti->ti_ack);
 #endif
        ti->ti_seq = htonl(ti->ti_seq);
        ti->ti_ack = htonl(ti->ti_ack);
 #endif

diff --git a/usr/src/sys/ufs/ffs/ufs_lookup.c b/usr/src/sys/ufs/ffs/ufs_lookup.c
index 4cb066b..e959eed 100644 (file)
--- 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.12    82/03/12        */
+/*     ufs_lookup.c    4.13    82/03/13        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -200,14 +200,16 @@ dirloop:
                                iput(pdp);
                                goto out;
                        }
                                iput(pdp);
                                goto out;
                        }

-                       bcopy(ocp, nbp->b_un.b_addr+dp->i_size, cp-ocp);
+                       bcopy(ocp, nbp->b_un.b_addr+dp->i_size,
+                         (unsigned)(cp-ocp));

                        bp = bread(dp->i_dev, bmap(dp, (daddr_t)0, B_READ));
                        if (bp->b_flags & B_ERROR) {
                                brelse(bp);
                                iput(pdp);
                                goto out;
                        }
                        bp = bread(dp->i_dev, bmap(dp, (daddr_t)0, B_READ));
                        if (bp->b_flags & B_ERROR) {
                                brelse(bp);
                                iput(pdp);
                                goto out;
                        }

-                       bcopy(bp->b_un.b_addr, nbp->b_un.b_addr, dp->i_size);
+                       bcopy(bp->b_un.b_addr, nbp->b_un.b_addr,
+                         (unsigned)dp->i_size);

                        brelse(bp);
                        cp = nbp->b_un.b_addr;
                        iput(dp);
                        brelse(bp);
                        cp = nbp->b_un.b_addr;
                        iput(dp);

diff --git a/usr/src/sys/ufs/ufs/ufs_lookup.c b/usr/src/sys/ufs/ufs/ufs_lookup.c
index 4cb066b..e959eed 100644 (file)
--- 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.12    82/03/12        */
+/*     ufs_lookup.c    4.13    82/03/13        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -200,14 +200,16 @@ dirloop:
                                iput(pdp);
                                goto out;
                        }
                                iput(pdp);
                                goto out;
                        }

-                       bcopy(ocp, nbp->b_un.b_addr+dp->i_size, cp-ocp);
+                       bcopy(ocp, nbp->b_un.b_addr+dp->i_size,
+                         (unsigned)(cp-ocp));

                        bp = bread(dp->i_dev, bmap(dp, (daddr_t)0, B_READ));
                        if (bp->b_flags & B_ERROR) {
                                brelse(bp);
                                iput(pdp);
                                goto out;
                        }
                        bp = bread(dp->i_dev, bmap(dp, (daddr_t)0, B_READ));
                        if (bp->b_flags & B_ERROR) {
                                brelse(bp);
                                iput(pdp);
                                goto out;
                        }

-                       bcopy(bp->b_un.b_addr, nbp->b_un.b_addr, dp->i_size);
+                       bcopy(bp->b_un.b_addr, nbp->b_un.b_addr,
+                         (unsigned)dp->i_size);

                        brelse(bp);
                        cp = nbp->b_un.b_addr;
                        iput(dp);
                        brelse(bp);
                        cp = nbp->b_un.b_addr;
                        iput(dp);

diff --git a/usr/src/sys/vax/if/if_acc.c b/usr/src/sys/vax/if/if_acc.c
index 666de23..3eb9750 100644 (file)
--- a/usr/src/sys/vax/if/if_acc.c
+++ b/usr/src/sys/vax/if/if_acc.c
@@ -1,4 +1,4 @@
-/*     if_acc.c        4.8     82/03/12        */
+/*     if_acc.c        4.9     82/03/13        */

 
 #include "acc.h"
 #ifdef NACC > 0
 
 #include "acc.h"
 #ifdef NACC > 0


@@ -162,7 +162,8 @@ COUNT(ACCINIT);
         * sizeof(struct imp_leader), then the if_ routines
         * would asssume we handle it on input and output.
         */
         * sizeof(struct imp_leader), then the if_ routines
         * would asssume we handle it on input and output.
         */

-       if (if_ubainit(&sc->acc_ifuba, ui->ui_ubanum, 0, btoc(IMP_MTU)) == 0) {
+       if (if_ubainit(&sc->acc_ifuba, ui->ui_ubanum, 0,
+            (int)btoc(IMP_MTU)) == 0) {

                printf("acc%d: can't initialize\n", unit);
                goto down;
        }
                printf("acc%d: can't initialize\n", unit);
                goto down;
        }


@@ -300,7 +301,6 @@ accrint(unit)
 {
        register struct acc_softc *sc = &acc_softc[unit];
        register struct accdevice *addr;
 {
        register struct acc_softc *sc = &acc_softc[unit];
        register struct accdevice *addr;

-       register struct ifqueue *inq;

        struct mbuf *m;
        int len, info;
 
        struct mbuf *m;
        int len, info;
 

diff --git a/usr/src/sys/vax/if/if_dmc.c b/usr/src/sys/vax/if/if_dmc.c
index c658a4b..31503f6 100644 (file)
--- a/usr/src/sys/vax/if/if_dmc.c
+++ b/usr/src/sys/vax/if/if_dmc.c
@@ -1,4 +1,4 @@
-/*     if_dmc.c        4.3     82/02/15        */
+/*     if_dmc.c        4.4     82/03/13        */

 
 #include "dmc.h"
 #if NDMC > 0
 
 #include "dmc.h"
 #if NDMC > 0


@@ -228,9 +228,9 @@ dmcload(sc, type, w0, w1)
        if ((n = sc->sc_que.c_cc) == 0)
                addr->bsel0 = type | DMC_RQI;
        else
        if ((n = sc->sc_que.c_cc) == 0)
                addr->bsel0 = type | DMC_RQI;
        else

-               putc(type | DMC_RQI, &sc->sc_que);
-       putw(w0, &sc->sc_que);
-       putw(w1, &sc->sc_que);
+               (void) putc(type | DMC_RQI, &sc->sc_que);
+       (void) putw(w0, &sc->sc_que);
+       (void) putw(w1, &sc->sc_que);

        if (n == 0)
                dmcrint(unit);
        splx(sps);
        if (n == 0)
                dmcrint(unit);
        splx(sps);

diff --git a/usr/src/sys/vax/if/if_en.c b/usr/src/sys/vax/if/if_en.c
index 7fa716c..3a49001 100644 (file)
--- a/usr/src/sys/vax/if/if_en.c
+++ b/usr/src/sys/vax/if/if_en.c
@@ -1,4 +1,4 @@
-/*     if_en.c 4.37    82/03/09        */
+/*     if_en.c 4.38    82/03/13        */

 
 #include "en.h"
 
 
 #include "en.h"
 


@@ -408,7 +408,8 @@ COUNT(ENRINT);
                pupproto.sp_protocol = pup->pup_type;
                pupdst.spup_addr = pup->pup_dport;
                pupsrc.spup_addr = pup->pup_sport;
                pupproto.sp_protocol = pup->pup_type;
                pupdst.spup_addr = pup->pup_dport;
                pupsrc.spup_addr = pup->pup_sport;

-               raw_input(m, &pupproto, &pupdst, &pupsrc);
+               raw_input(m, &pupproto, (struct sockaddr *)&pupdst,
+                (struct sockaddr *)&pupsrc);

                goto setup;
                }
        }
                goto setup;
                }
        }

diff --git a/usr/src/sys/vax/uba/dz.c b/usr/src/sys/vax/uba/dz.c
index 2738789..bb42256 100644 (file)
--- a/usr/src/sys/vax/uba/dz.c
+++ b/usr/src/sys/vax/uba/dz.c
@@ -1,4 +1,4 @@
-/*     dz.c    4.34    82/03/12        */
+/*     dz.c    4.35    82/03/13        */

 
 #include "dz.h"
 #if NDZ > 0
 
 #include "dz.h"
 #if NDZ > 0


@@ -13,6 +13,7 @@
 #include "../h/tty.h"
 #include "../h/dir.h"
 #include "../h/user.h"
 #include "../h/tty.h"
 #include "../h/dir.h"
 #include "../h/user.h"

+#include "../h/proc.h"

 #include "../h/map.h"
 #include "../h/pte.h"
 #include "../h/buf.h"
 #include "../h/map.h"
 #include "../h/pte.h"
 #include "../h/buf.h"


@@ -215,7 +216,7 @@ dzopen(dev, flag)
                u.u_error = EBUSY;
                return;
        }
                u.u_error = EBUSY;
                return;
        }

-       dzmctl(dev, DZ_ON, DMSET);
+       (void) dzmctl(dev, DZ_ON, DMSET);

        (void) spl5();
        while ((tp->t_state & TS_CARR_ON) == 0) {
                tp->t_state |= TS_WOPEN;
        (void) spl5();
        while ((tp->t_state & TS_CARR_ON) == 0) {
                tp->t_state |= TS_WOPEN;


@@ -240,11 +241,11 @@ dzclose(dev, flag)
        (*linesw[tp->t_line].l_close)(tp);
        dzaddr = dzpdma[unit].p_addr;
        if (dzaddr->dzcsr&DZ_32)
        (*linesw[tp->t_line].l_close)(tp);
        dzaddr = dzpdma[unit].p_addr;
        if (dzaddr->dzcsr&DZ_32)

-               dzmctl(dev, DZ_BRK, DMBIC);
+               (void) dzmctl(dev, DZ_BRK, DMBIC);

        else
                dzaddr->dzbrk = (dz_brk[dz] &= ~(1 << (unit&07)));
        if ((tp->t_state&TS_HUPCLS) || (tp->t_state&TS_ISOPEN) == 0)
        else
                dzaddr->dzbrk = (dz_brk[dz] &= ~(1 << (unit&07)));
        if ((tp->t_state&TS_HUPCLS) || (tp->t_state&TS_ISOPEN) == 0)

-               dzmctl(dev, DZ_OFF, DMSET);
+               (void) dzmctl(dev, DZ_OFF, DMSET);

        ttyclose(tp);
 }
  
        ttyclose(tp);
 }
  


@@ -361,40 +362,40 @@ dzioctl(dev, cmd, addr, flag)
        case TIOCSBRK:
                dzaddr = ((struct pdma *)(tp->t_addr))->p_addr;
                if (dzaddr->dzcsr&DZ_32)
        case TIOCSBRK:
                dzaddr = ((struct pdma *)(tp->t_addr))->p_addr;
                if (dzaddr->dzcsr&DZ_32)

-                       dzmctl(dev, DZ_BRK, DMBIS);
+                       (void) dzmctl(dev, DZ_BRK, DMBIS);

                else
                        dzaddr->dzbrk = (dz_brk[dz] |= 1 << (unit&07));
                break;
        case TIOCCBRK:
                dzaddr = ((struct pdma *)(tp->t_addr))->p_addr;
                if (dzaddr->dzcsr&DZ_32)
                else
                        dzaddr->dzbrk = (dz_brk[dz] |= 1 << (unit&07));
                break;
        case TIOCCBRK:
                dzaddr = ((struct pdma *)(tp->t_addr))->p_addr;
                if (dzaddr->dzcsr&DZ_32)

-                       dzmctl(dev, DZ_BRK, DMBIC);
+                       (void) dzmctl(dev, DZ_BRK, DMBIC);

                else
                        dzaddr->dzbrk = (dz_brk[dz] &= ~(1 << (unit&07)));
                break;
        case TIOCSDTR:
                else
                        dzaddr->dzbrk = (dz_brk[dz] &= ~(1 << (unit&07)));
                break;
        case TIOCSDTR:

-               dzmctl(dev, DZ_DTR|DZ_RTS, DMBIS);
+               (void) dzmctl(dev, DZ_DTR|DZ_RTS, DMBIS);

                break;
        case TIOCCDTR:
                break;
        case TIOCCDTR:

-               dzmctl(dev, DZ_DTR|DZ_RTS, DMBIC);
+               (void) dzmctl(dev, DZ_DTR|DZ_RTS, DMBIC);

                break;
        case TIOCMSET:
                if (copyin(addr, (caddr_t) &temp, sizeof(temp)))
                        u.u_error = EFAULT;
                else
                break;
        case TIOCMSET:
                if (copyin(addr, (caddr_t) &temp, sizeof(temp)))
                        u.u_error = EFAULT;
                else

-                       dzmctl(dev, dmtodz(temp), DMSET);
+                       (void) dzmctl(dev, dmtodz(temp), DMSET);

                break;
        case TIOCMBIS:
                if (copyin(addr, (caddr_t) &temp, sizeof(temp)))
                        u.u_error = EFAULT;
                else
                break;
        case TIOCMBIS:
                if (copyin(addr, (caddr_t) &temp, sizeof(temp)))
                        u.u_error = EFAULT;
                else

-                       dzmctl(dev, dmtodz(temp), DMBIS);
+                       (void) dzmctl(dev, dmtodz(temp), DMBIS);

                break;
        case TIOCMBIC:
                if (copyin(addr, (caddr_t) &temp, sizeof(temp)))
                        u.u_error = EFAULT;
                else
                break;
        case TIOCMBIC:
                if (copyin(addr, (caddr_t) &temp, sizeof(temp)))
                        u.u_error = EFAULT;
                else

-                       dzmctl(dev, dmtodz(temp), DMBIC);
+                       (void) dzmctl(dev, dmtodz(temp), DMBIC);

                break;
        case TIOCMGET:
                temp = dztodm(dzmctl(dev, 0, DMGET));
                break;
        case TIOCMGET:
                temp = dztodm(dzmctl(dev, 0, DMGET));


@@ -444,7 +445,7 @@ dzparam(unit)
        dzaddr->dzcsr = DZ_IEN;
        dzact |= (1<<(unit>>3));
        if (tp->t_ispeed == 0) {
        dzaddr->dzcsr = DZ_IEN;
        dzact |= (1<<(unit>>3));
        if (tp->t_ispeed == 0) {

-               dzmctl(unit, DZ_OFF, DMSET);    /* hang up line */
+               (void) dzmctl(unit, DZ_OFF, DMSET);     /* hang up line */

                return;
        }
        lpr = (dz_speeds[tp->t_ispeed]<<8) | (unit & 07);
                return;
        }
        lpr = (dz_speeds[tp->t_ispeed]<<8) | (unit & 07);


@@ -688,7 +689,7 @@ dzreset(uban)
                tp = &dz_tty[unit];
                if (tp->t_state & (TS_ISOPEN|TS_WOPEN)) {
                        dzparam(unit);
                tp = &dz_tty[unit];
                if (tp->t_state & (TS_ISOPEN|TS_WOPEN)) {
                        dzparam(unit);

-                       dzmctl(unit, DZ_ON, DMSET);
+                       (void) dzmctl(unit, DZ_ON, DMSET);

                        tp->t_state &= ~TS_BUSY;
                        dzstart(tp);
                }
                        tp->t_state &= ~TS_BUSY;
                        dzstart(tp);
                }

diff --git a/usr/src/sys/vax/vax/cons.c b/usr/src/sys/vax/vax/cons.c
index a918a22..6b4e987 100644 (file)
--- a/usr/src/sys/vax/vax/cons.c
+++ b/usr/src/sys/vax/vax/cons.c
@@ -1,4 +1,4 @@
-/*     cons.c  4.12    82/01/14        */
+/*     cons.c  4.13    82/03/13        */

 
 /*
  * Vax console driver and floppy interface
 
 /*
  * Vax console driver and floppy interface


@@ -11,6 +11,7 @@
 #include "../h/conf.h"
 #include "../h/dir.h"
 #include "../h/user.h"
 #include "../h/conf.h"
 #include "../h/dir.h"
 #include "../h/user.h"

+#include "../h/proc.h"

 #include "../h/tty.h"
 #include "../h/systm.h"
 #include "../h/cons.h"
 #include "../h/tty.h"
 #include "../h/systm.h"
 #include "../h/cons.h"