kernel/netproto: Remove some unused variables.

diff --git a/sys/netproto/ipsec/key.c b/sys/netproto/ipsec/key.c
index 038a9d3..1c680b1 100644 (file)
--- a/sys/netproto/ipsec/key.c
+++ b/sys/netproto/ipsec/key.c
@@ -6158,7 +6158,6 @@ key_dump(struct socket *so, struct mbuf *m, const struct sadb_msghdr *mhp)
        u_int8_t satype;
        u_int8_t state;
        int cnt;
-       struct sadb_msg *newmsg;
        struct mbuf *n;
 
        /* sanity check */
@@ -6191,7 +6190,6 @@ key_dump(struct socket *so, struct mbuf *m, const struct sadb_msghdr *mhp)
                return key_senderror(so, m, ENOENT);
 
        /* send this to the userland, one at a time. */
-       newmsg = NULL;
        LIST_FOREACH(sah, &sahtree, chain) {
                if (mhp->msg->sadb_msg_satype != SADB_SATYPE_UNSPEC
                 && proto != sah->saidx.proto)

diff --git a/sys/netproto/ipsec/xform_ipcomp.c b/sys/netproto/ipsec/xform_ipcomp.c
index 6db4276..b937473 100644 (file)
--- a/sys/netproto/ipsec/xform_ipcomp.c
+++ b/sys/netproto/ipsec/xform_ipcomp.c
@@ -227,10 +227,8 @@ ipcomp_input(struct mbuf *m, struct secasvar *sav, int skip, int protoff)
 static int
 ipcomp_input_cb(struct cryptop *crp)
 {
-       struct cryptodesc *crd;
        struct tdb_crypto *tc;
        int skip, protoff;
-       struct mtag *mtag;
        struct mbuf *m;
        struct secasvar *sav;
        struct secasindex *saidx;
@@ -238,13 +236,10 @@ ipcomp_input_cb(struct cryptop *crp)
        u_int8_t nproto;
        caddr_t addr;
 
-       crd = crp->crp_desc;
-
        tc = (struct tdb_crypto *) crp->crp_opaque;
        KASSERT(tc != NULL, ("ipcomp_input_cb: null opaque crypto data area!"));
        skip = tc->tc_skip;
        protoff = tc->tc_protoff;
-       mtag = (struct mtag *) tc->tc_ptr;
        m = (struct mbuf *) crp->crp_buf;
 
        crit_enter();

diff --git a/sys/netproto/ipx/ipx_input.c b/sys/netproto/ipx/ipx_input.c
index 6ad58ac..aa0228b 100644 (file)
--- a/sys/netproto/ipx/ipx_input.c
+++ b/sys/netproto/ipx/ipx_input.c
@@ -283,7 +283,6 @@ ipx_ctlinput(netmsg_t msg)
        int cmd = msg->ctlinput.nm_cmd;
        struct sockaddr *arg_as_sa = msg->ctlinput.nm_arg;
        caddr_t arg = (/* XXX */ caddr_t)arg_as_sa;
-       struct ipx_addr *ipx;
        struct sockaddr_ipx *sipx;
 
        if (cmd < 0 || cmd > PRC_NCMDS)
@@ -296,7 +295,6 @@ ipx_ctlinput(netmsg_t msg)
                sipx = (struct sockaddr_ipx *)arg;
                if (sipx->sipx_family != AF_IPX)
                        break;
-               ipx = &sipx->sipx_addr;
                break;
 
        default:

diff --git a/sys/netproto/ipx/spx_usrreq.c b/sys/netproto/ipx/spx_usrreq.c
index b6bd990..a1c9348 100644 (file)
--- a/sys/netproto/ipx/spx_usrreq.c
+++ b/sys/netproto/ipx/spx_usrreq.c
@@ -667,7 +667,6 @@ spx_ctlinput(netmsg_t msg)
        int cmd = msg->ctlinput.nm_cmd;
        struct sockaddr *arg_as_sa = msg->ctlinput.nm_arg;
        caddr_t arg = (/* XXX */ caddr_t)arg_as_sa;
-       struct ipx_addr *na;
        struct sockaddr_ipx *sipx;
 
        if (cmd < 0 || cmd > PRC_NCMDS)
@@ -682,7 +681,6 @@ spx_ctlinput(netmsg_t msg)
                sipx = (struct sockaddr_ipx *)arg;
                if (sipx->sipx_family != AF_IPX)
                        break;
-               na = &sipx->sipx_addr;
                break;
        default:
                break;

diff --git a/sys/netproto/key/key.c b/sys/netproto/key/key.c
index e361bd6..a6205fb 100644 (file)
--- a/sys/netproto/key/key.c
+++ b/sys/netproto/key/key.c
@@ -6521,7 +6521,6 @@ key_dump(struct socket *so, struct mbuf *m,
        u_int8_t satype;
        u_int8_t state;
        int cnt;
-       struct sadb_msg *newmsg;
        struct mbuf *n;
 
        /* sanity check */
@@ -6555,7 +6554,6 @@ key_dump(struct socket *so, struct mbuf *m,
                return key_senderror(so, m, ENOENT);
 
        /* send this to the userland, one at a time. */
-       newmsg = NULL;
        LIST_FOREACH(sah, &sahtree, chain) {
                if (mhp->msg->sadb_msg_satype != SADB_SATYPE_UNSPEC
                 && proto != sah->saidx.proto)
@@ -6682,7 +6680,6 @@ key_parse(struct mbuf *m, struct socket *so)
 {
        struct sadb_msg *msg;
        struct sadb_msghdr mh;
-       u_int orglen;
        int error;
        int target;
 
@@ -6702,7 +6699,6 @@ key_parse(struct mbuf *m, struct socket *so)
                        return ENOBUFS;
        }
        msg = mtod(m, struct sadb_msg *);
-       orglen = PFKEY_UNUNIT64(msg->sadb_msg_len);
        target = KEY_SENDUP_ONE;
 
        if ((m->m_flags & M_PKTHDR) == 0 ||

diff --git a/sys/netproto/ncp/ncp_ncp.c b/sys/netproto/ncp/ncp_ncp.c
index 5a4cded..99e3ecf 100644 (file)
--- a/sys/netproto/ncp/ncp_ncp.c
+++ b/sys/netproto/ncp/ncp_ncp.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netncp/ncp_ncp.c,v 1.3 1999/10/29 10:21:07 bp Exp $
- * $DragonFly: src/sys/netproto/ncp/ncp_ncp.c,v 1.15 2007/04/22 01:13:16 dillon Exp $
  *
  * Core of NCP protocol
  */
@@ -147,7 +146,6 @@ bad:
 int
 ncp_ncp_disconnect(struct ncp_conn *conn) {
        int error;
-       struct ncp_rqhdr *ncprq;
        DECLARE_RQ;
 
        NCPSDEBUG("for connid=%d\n",conn->nc_id);
@@ -155,7 +153,6 @@ ncp_ncp_disconnect(struct ncp_conn *conn) {
        ncp_burst_disconnect(conn);
 #endif
        error=ncp_rq_head(rqp,NCP_FREE_SLOT,0,conn->td,conn->ucred);
-       ncprq = mtod(rqp->rq,struct ncp_rqhdr*);
        error=ncp_do_request(conn,rqp);
        ncp_rq_done(rqp);
        ncp_conn_invalidate(conn);

diff --git a/sys/netproto/smb/smb_iod.c b/sys/netproto/smb/smb_iod.c
index 1a1e783..6282be4 100644 (file)
--- a/sys/netproto/smb/smb_iod.c
+++ b/sys/netproto/smb/smb_iod.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netsmb/smb_iod.c,v 1.1.2.2 2002/04/23 03:45:01 bp Exp $
- * $DragonFly: src/sys/netproto/smb/smb_iod.c,v 1.15 2007/02/03 17:05:58 corecode Exp $
  */
  
 #include <sys/param.h>
@@ -600,11 +599,11 @@ smb_iod_main(struct smbiod *iod)
 {
 /*     struct smb_vc *vcp = iod->iod_vc;*/
        struct smbiod_event *evp;
-/*     struct timespec tsnow;*/
-       int error;
+#if 0
+       struct timespec tsnow;
+#endif
 
        SMBIODEBUG("\n");
-       error = 0;
 
        /*
         * Check all interesting events

diff --git a/sys/netproto/smb/smb_smb.c b/sys/netproto/smb/smb_smb.c
index 3c2a655..e1c7e71 100644 (file)
--- a/sys/netproto/smb/smb_smb.c
+++ b/sys/netproto/smb/smb_smb.c
@@ -235,7 +235,7 @@ smb_smb_ssnsetup(struct smb_vc *vcp, struct smb_cred *scred)
        u_int16_t tw, tw1;*/
        smb_uniptr unipp, ntencpass = NULL;
        char *pp, *up, *pbuf, *encpass;
-       int error, plen, uniplen, ulen;
+       int error, plen, uniplen;
 
        vcp->vc_smbuid = SMB_UID_UNKNOWN;
 
@@ -288,7 +288,6 @@ smb_smb_ssnsetup(struct smb_vc *vcp, struct smb_cred *scred)
        smb_rq_wstart(rqp);
        mbp = &rqp->sr_rq;
        up = vcp->vc_username;
-       ulen = strlen(up) + 1;
        mb_put_uint8(mbp, 0xff);
        mb_put_uint8(mbp, 0);
        mb_put_uint16le(mbp, 0);
@@ -466,7 +465,6 @@ int
 smb_smb_treedisconnect(struct smb_share *ssp, struct smb_cred *scred)
 {
        struct smb_rq *rqp;
-       struct mbchain *mbp;
        int error;
 
        if (ssp->ss_tid == SMB_TID_UNKNOWN)
@@ -474,7 +472,6 @@ smb_smb_treedisconnect(struct smb_share *ssp, struct smb_cred *scred)
        error = smb_rq_alloc(SSTOCP(ssp), SMB_COM_TREE_DISCONNECT, scred, &rqp);
        if (error)
                return error;
-       mbp = &rqp->sr_rq;
        smb_rq_wstart(rqp);
        smb_rq_wend(rqp);
        smb_rq_bstart(rqp);