lint

SCCS-vsn: sys/vax/uba/idc.c 4.9
SCCS-vsn: sys/deprecated/netpup/raw_pup.c 4.15
SCCS-vsn: sys/net/raw_usrreq.c 4.22
SCCS-vsn: sys/netinet/in.c 4.8
SCCS-vsn: sys/kern/uipc_socket.c 4.58

diff --git a/usr/src/sys/deprecated/netpup/raw_pup.c b/usr/src/sys/deprecated/netpup/raw_pup.c
index 455e1ae..7c3c825 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.14    82/10/09        */
+/*     raw_pup.c       4.15    82/10/20        */

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


@@ -50,13 +50,13 @@ rpup_output(m, so)
        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;

-#if vax || pdp11
+#if vax || pdp11 || ns16032

        pup->pup_length = htons(pup->pup_length);
 #endif
        /* assume user generates PUP checksum. */
        dst = (struct sockaddr_pup *)&rp->rcb_faddr;
        pup->pup_dport = dst->spup_addr;
        pup->pup_length = htons(pup->pup_length);
 #endif
        /* assume user generates PUP checksum. */
        dst = (struct sockaddr_pup *)&rp->rcb_faddr;
        pup->pup_dport = dst->spup_addr;

-       ifp = if_ifonnetof(pup->pup_dnet);
+       ifp = if_ifonnetof((int)pup->pup_dnet);

        if (ifp) {
                if (rp->rcb_flags & RAW_LADDR) {
                        register struct sockaddr_pup *src;
        if (ifp) {
                if (rp->rcb_flags & RAW_LADDR) {
                        register struct sockaddr_pup *src;

diff --git a/usr/src/sys/kern/uipc_socket.c b/usr/src/sys/kern/uipc_socket.c
index bb1bed8..c8c579f 100644 (file)
--- a/usr/src/sys/kern/uipc_socket.c
+++ b/usr/src/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/*     uipc_socket.c   4.57    82/10/20        */
+/*     uipc_socket.c   4.58    82/10/20        */

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


@@ -145,7 +145,7 @@ soclose(so, exiting)
                so->so_options |= SO_KEEPALIVE;
        if (so->so_state & SS_ISCONNECTED) {
                if ((so->so_state & SS_ISDISCONNECTING) == 0) {
                so->so_options |= SO_KEEPALIVE;
        if (so->so_state & SS_ISCONNECTED) {
                if ((so->so_state & SS_ISDISCONNECTING) == 0) {

-                       error = sodisconnect(so, (struct sockaddr *)0);
+                       error = sodisconnect(so, (struct mbuf *)0);

                        if (error) {
                                if (exiting)
                                        goto drop;
                        if (error) {
                                if (exiting)
                                        goto drop;

diff --git a/usr/src/sys/net/raw_usrreq.c b/usr/src/sys/net/raw_usrreq.c
index 23654a4..df108fd 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.21    82/10/20        */
+/*     raw_usrreq.c    4.22    82/10/20        */

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


@@ -243,7 +243,7 @@ raw_usrreq(so, req, m, nam, opt)
                break;
 
        case PRU_SOCKADDR:
                break;
 
        case PRU_SOCKADDR:

-               bcopy((caddr_t)&rp->rcb_laddr, mtod(nam, struct sockaddr *),
+               bcopy((caddr_t)&rp->rcb_laddr, mtod(nam, caddr_t),

                    sizeof (struct sockaddr));
                nam->m_len = sizeof (struct sockaddr);
                break;
                    sizeof (struct sockaddr));
                nam->m_len = sizeof (struct sockaddr);
                break;

diff --git a/usr/src/sys/netinet/in.c b/usr/src/sys/netinet/in.c
index 87e30c8..cd5742b 100644 (file)
--- a/usr/src/sys/netinet/in.c
+++ b/usr/src/sys/netinet/in.c
@@ -1,4 +1,4 @@
-/*     in.c    4.7     82/10/20        */
+/*     in.c    4.8     82/10/20        */

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


@@ -72,6 +72,7 @@ in_netof(in)
                return (((i)&IN_CLASSC_NET) >> IN_CLASSC_NSHIFT);
 }
 
                return (((i)&IN_CLASSC_NET) >> IN_CLASSC_NSHIFT);
 }
 

+#ifndef notdef

 /*
  * Return the host portion of an internet address.
  */
 /*
  * Return the host portion of an internet address.
  */


@@ -90,6 +91,7 @@ in_lnaof(in)
        else
                return ((i)&IN_CLASSC_HOST);
 }
        else
                return ((i)&IN_CLASSC_HOST);
 }

+#endif

 
 /*
  * Initialize an interface's routing
 
 /*
  * Initialize an interface's routing

diff --git a/usr/src/sys/vax/uba/idc.c b/usr/src/sys/vax/uba/idc.c
index 5982cc0..e695af0 100644 (file)
--- a/usr/src/sys/vax/uba/idc.c
+++ b/usr/src/sys/vax/uba/idc.c
@@ -1,4 +1,4 @@
-/*     idc.c   4.8     82/10/17        */
+/*     idc.c   4.9     82/10/20        */

 
 #include "rb.h"
 #if NIDC > 0
 
 #include "rb.h"
 #if NIDC > 0


@@ -147,13 +147,13 @@ idcslave(ui, reg)
        ui->ui_type = 0;
        idcaddr->idcmpr = IDCGS_GETSTAT;
        idcaddr->idccsr = IDC_GETSTAT|(ui->ui_slave<<8);
        ui->ui_type = 0;
        idcaddr->idcmpr = IDCGS_GETSTAT;
        idcaddr->idccsr = IDC_GETSTAT|(ui->ui_slave<<8);

-       idcwait(idcaddr, 0);
+       (void) idcwait(idcaddr, 0);

        i = idcaddr->idcmpr;
        idcaddr->idccsr = IDC_CRDY|(1<<(ui->ui_slave+16));
        /* read header to synchronize microcode */
        i = idcaddr->idcmpr;
        idcaddr->idccsr = IDC_CRDY|(1<<(ui->ui_slave+16));
        /* read header to synchronize microcode */

-       idcwait(idcaddr, 0);
+       (void) idcwait(idcaddr, 0);

        idcaddr->idccsr = (ui->ui_slave<<8)|IDC_RHDR;
        idcaddr->idccsr = (ui->ui_slave<<8)|IDC_RHDR;

-       idcwait(idcaddr, 0);
+       (void) idcwait(idcaddr, 0);

        if (idcaddr->idccsr & IDC_ERR)
                return (0);
        i = idcaddr->idcmpr;            /* read header word 1 */
        if (idcaddr->idccsr & IDC_ERR)
                return (0);
        i = idcaddr->idcmpr;            /* read header word 1 */


@@ -467,7 +467,7 @@ top:
                        if (er & IDC_DE) {
                                idcaddr->idcmpr = IDCGS_GETSTAT;
                                idcaddr->idccsr = IDC_GETSTAT|(unit<<8);
                        if (er & IDC_DE) {
                                idcaddr->idcmpr = IDCGS_GETSTAT;
                                idcaddr->idccsr = IDC_GETSTAT|(unit<<8);

-                               idcwait(idcaddr, 0);
+                               (void) idcwait(idcaddr, 0);

                                ds = idcaddr->idcmpr;
                                idcaddr->idccsr =
                                    IDC_IE|IDC_CRDY|(1<<(unit+16));
                                ds = idcaddr->idcmpr;
                                idcaddr->idccsr =
                                    IDC_IE|IDC_CRDY|(1<<(unit+16));


@@ -628,7 +628,7 @@ cont:
        printd("\n");
        if (um->um_tab.b_actf && um->um_tab.b_active == 0) {
                trace("stum",um->um_tab.b_actf);
        printd("\n");
        if (um->um_tab.b_actf && um->um_tab.b_active == 0) {
                trace("stum",um->um_tab.b_actf);

-               idcstart(um);
+               (void) idcstart(um);

        }
 }
 
        }
 }
 


@@ -790,7 +790,7 @@ idcdump(dev)
        idcaddr->idccs1 = IDC_CCLR;
        idcaddr->idccs2 = unit;
        idcaddr->idccs1 = idctypes[ui->ui_type]|IDC_DCLR|IDC_GO;
        idcaddr->idccs1 = IDC_CCLR;
        idcaddr->idccs2 = unit;
        idcaddr->idccs1 = idctypes[ui->ui_type]|IDC_DCLR|IDC_GO;

-       idcwait(idcaddr);
+       (void) idcwait(idcaddr);

        dbsize = 20 or 31;
 ***/
        st = &idcst[ui->ui_type];
        dbsize = 20 or 31;
 ***/
        st = &idcst[ui->ui_type];


@@ -820,7 +820,7 @@ idcdump(dev)
                *--rp = 0;
                *--rp = -blk*NBPG / sizeof (short);
                *--rp = idctypes[ui->ui_type]|IDC_GO|IDC_WRITE;
                *--rp = 0;
                *--rp = -blk*NBPG / sizeof (short);
                *--rp = idctypes[ui->ui_type]|IDC_GO|IDC_WRITE;

-               idcwait(idcaddr);
+               (void) idcwait(idcaddr);

 ***/
                if (idcaddr->idccsr & IDC_ERR)
                        return (EIO);
 ***/
                if (idcaddr->idccsr & IDC_ERR)
                        return (EIO);