[src/trunk]: src/crypto/dist/ipsec-tools/src/racoon More unused ...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2efa9b0d7ed1
branches:  trunk
changeset: 319184:2efa9b0d7ed1
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat May 19 19:32:16 2018 +0000

description:
More unused variables.

diffstat:

 crypto/dist/ipsec-tools/src/racoon/cfparse.y      |  5 +----
 crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c   |  9 ++-------
 crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c  |  3 +--
 crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c |  8 +-------
 4 files changed, 5 insertions(+), 20 deletions(-)

diffs (144 lines):

diff -r 8e5299131900 -r 2efa9b0d7ed1 crypto/dist/ipsec-tools/src/racoon/cfparse.y
--- a/crypto/dist/ipsec-tools/src/racoon/cfparse.y      Sat May 19 19:23:15 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/cfparse.y      Sat May 19 19:32:16 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cfparse.y,v 1.49 2016/02/17 20:11:17 christos Exp $    */
+/*     $NetBSD: cfparse.y,v 1.50 2018/05/19 19:32:16 maxv Exp $        */
 
 /* Id: cfparse.y,v 1.66 2006/08/22 18:17:17 manubsd Exp */
 
@@ -1543,7 +1543,6 @@
                {
                        char portbuf[10];
                        struct sockaddr *laddr = NULL, *haddr = NULL;
-                       char *cur = NULL;
 
                        if (($6 == IPPROTO_ICMP || $6 == IPPROTO_ICMPV6)
                         && ($5 != IPSEC_PORT_ANY || $5 != IPSEC_PORT_ANY)) {
@@ -2013,7 +2012,6 @@
        |       PEERS_CERTFILE CERT_PLAINRSA QUOTEDSTRING
                {
                        char path[MAXPATHLEN];
-                       int ret = 0;
 
                        if (cur_rmconf->peerscert != NULL) {
                                yyerror("peers_certfile already defined\n");
@@ -2365,7 +2363,6 @@
        |       CERT_PLAINRSA QUOTEDSTRING
                {
                        char path[MAXPATHLEN];
-                       int ret = 0;
 
                        if (cur_rmconf->mycert != NULL) {
                                yyerror("certificate_type already defined\n");
diff -r 8e5299131900 -r 2efa9b0d7ed1 crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c   Sat May 19 19:23:15 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c   Sat May 19 19:32:16 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isakmp_cfg.c,v 1.26 2016/03/09 22:27:17 christos Exp $ */
+/*     $NetBSD: isakmp_cfg.c,v 1.27 2018/05/19 19:32:16 maxv Exp $     */
 
 /* Id: isakmp_cfg.c,v 1.55 2006/08/22 18:17:17 manubsd Exp */
 
@@ -322,7 +322,6 @@
        size_t alen;
        char *npp;
        int type;
-       struct sockaddr_in *sin;
        int error;
 
        tlen = ntohs(attrpl->h.len);
@@ -782,7 +781,6 @@
 {
        int type;
        int confsource;
-       in_addr_t addr4;
 
        type = ntohs(attr->type);
 
@@ -1665,7 +1663,6 @@
        char *usr;
        int inout;
 {
-       int error = 0;
        struct utmpx ut;
        char addr[NI_MAXHOST];
        
@@ -1880,8 +1877,6 @@
        char defdom[MAXPATHLEN + 1];
        int cidr, tmp;
        char cidrstr[4];
-       int i, p;
-       int test;
 
        plog(LLV_DEBUG, LOCATION, NULL, "Starting a script.\n");
 
@@ -2134,7 +2129,6 @@
        int cold;
 {
        int i;
-       int error;
 
        isakmp_cfg_config.network4 = (in_addr_t)0x00000000;
        isakmp_cfg_config.netmask4 = (in_addr_t)0x00000000;
@@ -2184,6 +2178,7 @@
        isakmp_cfg_config.splitdns_len = 0;
 
 #if 0
+       int error;
        if (cold == ISAKMP_CFG_INIT_COLD) {
                if ((error = isakmp_cfg_resize_pool(ISAKMP_CFG_MAX_CNX)) != 0)
                        return error;
diff -r 8e5299131900 -r 2efa9b0d7ed1 crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c  Sat May 19 19:23:15 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c  Sat May 19 19:32:16 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isakmp_frag.c,v 1.7 2017/07/23 05:40:27 christos Exp $ */
+/*     $NetBSD: isakmp_frag.c,v 1.8 2018/05/19 19:32:16 maxv Exp $     */
 
 /* Id: isakmp_frag.c,v 1.4 2004/11/13 17:31:36 manubsd Exp */
 
@@ -219,7 +219,6 @@
        struct isakmp_frag *frag;
        struct isakmp_frag_item *item;
        vchar_t *buf;
-       size_t len;
        int last_frag = 0;
        char *data;
        int i;
diff -r 8e5299131900 -r 2efa9b0d7ed1 crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c Sat May 19 19:23:15 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c Sat May 19 19:32:16 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isakmp_xauth.c,v 1.28 2016/03/09 15:58:25 christos Exp $       */
+/*     $NetBSD: isakmp_xauth.c,v 1.29 2018/05/19 19:32:16 maxv Exp $   */
 
 /* Id: isakmp_xauth.c,v 1.38 2006/08/22 18:17:17 manubsd Exp */
 
@@ -655,7 +655,6 @@
        void *dontcare;
 {
        int i;
-       int replies = 0;
        struct pam_response *reply = NULL;
 
        if ((reply = racoon_malloc(sizeof(*reply) * msg_count)) == NULL) 
@@ -712,10 +711,6 @@
        char *pwd;
 {
        int error;
-       int res;
-       const void *data;
-       size_t len;
-       int type;
        char *remote = NULL;
        pam_handle_t *pam = NULL;
 
@@ -1630,7 +1625,6 @@
 {
        int type;
        vchar_t *buffer = NULL;
-       char *data;
        struct xauth_state *xst;
        size_t dlen = 0;
        char* mraw = NULL, *mdata;