From 7eb6f06c8ce13d98f5ed895f763ce1144a6e13f2 Mon Sep 17 00:00:00 2001 From: christos Date: Sun, 20 Oct 2013 21:17:28 +0000 Subject: [PATCH] remove unused variables --- crypto/dist/ipsec-tools/src/setkey/parse.y | 10 ++-------- .../external/bsd/openssl/dist/crypto/threads/mttest.c | 3 --- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/crypto/dist/ipsec-tools/src/setkey/parse.y b/crypto/dist/ipsec-tools/src/setkey/parse.y index c276ee6a7edd..915e52567783 100644 --- a/crypto/dist/ipsec-tools/src/setkey/parse.y +++ b/crypto/dist/ipsec-tools/src/setkey/parse.y @@ -1,4 +1,4 @@ -/* $NetBSD: parse.y,v 1.15 2012/01/09 15:25:13 drochner Exp $ */ +/* $NetBSD: parse.y,v 1.16 2013/10/20 21:17:28 christos Exp $ */ /* $KAME: parse.y,v 1.81 2003/07/01 04:01:48 itojun Exp $ */ @@ -954,7 +954,6 @@ setkeymsg_spdaddr(type, upper, policy, srcs, splen, dsts, dplen) int plen; struct sockaddr *sa; int salen; - struct sadb_x_policy *sp; #ifdef HAVE_POLICY_FWD struct sadb_x_ipsecrequest *ps = NULL; int saved_level, saved_id = 0; @@ -969,7 +968,6 @@ setkeymsg_spdaddr(type, upper, policy, srcs, splen, dsts, dplen) setkeymsg0(msg, type, SADB_SATYPE_UNSPEC, 0); l = sizeof(struct sadb_msg); - sp = (struct sadb_x_policy*) (buf + l); memcpy(buf + l, policy->buf, policy->len); l += policy->len; @@ -1094,11 +1092,10 @@ setkeymsg_spdaddr_tag(type, tag, policy) { struct sadb_msg *msg; char buf[BUFSIZ]; - int l, l0; + int l; #ifdef SADB_X_EXT_TAG struct sadb_x_tag m_tag; #endif - int n; msg = (struct sadb_msg *)buf; @@ -1109,9 +1106,6 @@ setkeymsg_spdaddr_tag(type, tag, policy) memcpy(buf + l, policy->buf, policy->len); l += policy->len; - l0 = l; - n = 0; - #ifdef SADB_X_EXT_TAG memset(&m_tag, 0, sizeof(m_tag)); m_tag.sadb_x_tag_len = PFKEY_UNIT64(sizeof(m_tag)); diff --git a/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c b/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c index 5a11e72becc4..ddba0ca5e2b6 100644 --- a/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c +++ b/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c @@ -427,7 +427,6 @@ int doit(char *ctx[4]) BIO *c_bio=NULL; BIO *s_bio=NULL; int c_r,c_w,s_r,s_w; - int c_want,s_want; int i; int done=0; int c_write,s_write; @@ -466,8 +465,6 @@ int doit(char *ctx[4]) c_r=0; s_r=1; c_w=1; s_w=0; - c_want=W_WRITE; - s_want=0; c_write=1,s_write=0; /* We can always do writes */