From 293fdf0dc84fc7da5792c01a16f822a7e8e1a0bf Mon Sep 17 00:00:00 2001
From: garden <garden@d37a7db1-d92d-0410-89df-f68f52f87b57>
Date: Sun, 12 Oct 2014 20:05:22 +0000
Subject: [PATCH] Clean up unused variables.

git-svn-id: https://svn.code.sf.net/p/vde/svn/trunk@581 d37a7db1-d92d-0410-89df-f68f52f87b57
---
 vde-2/src/common/canonicalize.c       | 4 ----
 vde-2/src/lib/python/vdeplug_python.c | 2 --
 vde-2/src/slirpvde/tftp.c             | 3 ---
 vde-2/src/vde_router/vde_router.c     | 3 +--
 vde-2/src/vde_router/vder_olsr.c      | 2 --
 vde-2/src/vde_switch/bitarray.h       | 2 +-
 vde-2/src/vde_switch/plugins/dump.c   | 5 ++---
 7 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/vde-2/src/common/canonicalize.c b/vde-2/src/common/canonicalize.c
index 457834f..13d0e5e 100644
--- a/vde-2/src/common/canonicalize.c
+++ b/vde-2/src/common/canonicalize.c
@@ -51,7 +51,6 @@ char *vde_realpath(const char *name, char *resolved)
 	char *resolved_root = resolved + 1;
 	char *ret_path = NULL;
 	int num_links = 0;
-	int validstat = 0;
 	struct stat *pst = NULL;
 
 	if (!name || !resolved)
@@ -128,7 +127,6 @@ char *vde_realpath(const char *name, char *resolved)
 		else if (end - start == 2 && start[0] == '.' && start[1] == '.')
 		{
 			/* Back up to previous component, ignore if at root already.  */
-			validstat = 0;
 			if (dest > resolved_root)
 				while ((--dest)[-1] != '/');
 		}
@@ -151,7 +149,6 @@ char *vde_realpath(const char *name, char *resolved)
 			*dest = '\0';
 
 			/*check the dir along the path */
-			validstat = 1;
 			if (lstat(resolved, pst) < 0)
 				goto abort;
 			else
@@ -169,7 +166,6 @@ char *vde_realpath(const char *name, char *resolved)
 					}
 
 					/* symlink! */
-					validstat = 0;
 					n = readlink (resolved, buf, PATH_MAX);
 					if (n < 0)
 						goto abort;
diff --git a/vde-2/src/lib/python/vdeplug_python.c b/vde-2/src/lib/python/vdeplug_python.c
index cf9e9c5..9d70e72 100644
--- a/vde-2/src/lib/python/vdeplug_python.c
+++ b/vde-2/src/lib/python/vdeplug_python.c
@@ -16,13 +16,11 @@ static PyObject *vdeplug_open(PyObject *self, PyObject *args)
 	struct vde_open_args vde_args = {0,NULL,0777};
 	char *vde_sock = NULL, *vde_descr = NULL;
 	VDECONN *ret;
-	int e;
 
 	if (!PyArg_ParseTuple(args, "ss|isi", &vde_sock, &vde_descr, &vde_args.port, &vde_args.group, &vde_args.mode))
 		goto failure; 
 
 	ret = vde_open_real(vde_sock, vde_descr, 1, &vde_args);
-	e = errno;
 	if (!ret)
 		goto failure;
 	else
diff --git a/vde-2/src/slirpvde/tftp.c b/vde-2/src/slirpvde/tftp.c
index 96c0e0c..67e9f2b 100644
--- a/vde-2/src/slirpvde/tftp.c
+++ b/vde-2/src/slirpvde/tftp.c
@@ -161,7 +161,6 @@ static void tftp_send_error(struct tftp_session *spt,
   struct sockaddr_in saddr, daddr;
   struct mbuf *m;
   struct tftp_t *tp;
-  int nobytes;
 
   m = m_get(spt->slirp);
 
@@ -185,8 +184,6 @@ static void tftp_send_error(struct tftp_session *spt,
   daddr.sin_addr = spt->client_ip;
   daddr.sin_port = spt->client_port;
 
-  nobytes = 2;
-
   m->m_len = sizeof(struct tftp_t) - 514 + 3 + strlen(msg) -
         sizeof(struct ip) - sizeof(struct udphdr);
 
diff --git a/vde-2/src/vde_router/vde_router.c b/vde-2/src/vde_router/vde_router.c
index 236923f..722d198 100644
--- a/vde-2/src/vde_router/vde_router.c
+++ b/vde-2/src/vde_router/vde_router.c
@@ -1387,7 +1387,7 @@ int main(int argc, char *argv[])
 	char cmd[MAXCMD];
 	int npfd = 0;
 	struct pollfd pfd[MAXCONN];
-	int consoleindex = -1, mgmtindex = -1;
+	int mgmtindex = -1;
 	int i, n, daemon = 0;
 	char *pidfile = NULL, *configfile = NULL;
 	int option_index;
@@ -1459,7 +1459,6 @@ int main(int argc, char *argv[])
 		}
 		setsid();
 	} else {
-		consoleindex = npfd;
 		pfd[npfd].fd = STDIN_FILENO;
 		pfd[npfd].events = POLLIN | POLLHUP;
 		write(STDOUT_FILENO,header,strlen(header));
diff --git a/vde-2/src/vde_router/vder_olsr.c b/vde-2/src/vde_router/vder_olsr.c
index 645e305..cc2a3e8 100644
--- a/vde-2/src/vde_router/vder_olsr.c
+++ b/vde-2/src/vde_router/vder_olsr.c
@@ -608,7 +608,6 @@ static int reconsider_topology(uint8_t *buf, int size, struct olsr_route_entry *
 static void olsr_recv(uint8_t *buffer, int len)
 {
 	struct olsrmsg *msg;
-	struct olsr_hmsg_tc *msg_tc;
 	struct olsrhdr *outohdr, *oh = (struct olsrhdr *) buffer;
 	struct olsr_route_entry *ancestor;
 	int parsed = 0;
@@ -653,7 +652,6 @@ static void olsr_recv(uint8_t *buffer, int len)
 				recv_mid(buffer + parsed + sizeof(struct olsrmsg), ntohs(msg->size) - (sizeof(struct olsrmsg)), origin);
 				break;
 			case OLSRMSG_TC:
-				msg_tc = (struct olsr_hmsg_tc *) (buffer + parsed);
 				if (reconsider_topology(buffer + parsed + sizeof(struct olsrmsg), ntohs(msg->size) - (sizeof(struct olsrmsg)), origin) < 1)
 					msg->ttl = 0;
 				else {
diff --git a/vde-2/src/vde_switch/bitarray.h b/vde-2/src/vde_switch/bitarray.h
index 88352d2..5daec72 100644
--- a/vde-2/src/vde_switch/bitarray.h
+++ b/vde-2/src/vde_switch/bitarray.h
@@ -142,7 +142,7 @@ static inline void ba_zap(bitarray x,int n)
 	 for (__i=0; __i< max; __i++) \
 	 for (__v=(X)[__i],__j=0; __j < __VDEWORDSIZE; __v >>=1, __j++) \
 	 if (__v & 1) {(K)=__i*__VDEWORDSIZE+__j;(EXPR);} \
-	 0; })
+	 (K); })
 
 static inline int ba_card(bitarray x,int n)
 {
diff --git a/vde-2/src/vde_switch/plugins/dump.c b/vde-2/src/vde_switch/plugins/dump.c
index 6132158..09d04e2 100644
--- a/vde-2/src/vde_switch/plugins/dump.c
+++ b/vde-2/src/vde_switch/plugins/dump.c
@@ -32,11 +32,10 @@ static struct dbgcl dl[]= {
 static int dump(char *arg)
 {
 	int active=atoi(arg);
-	int rv;
 	if (active)
-		rv=eventadd(testevent,"packet",dl);
+		eventadd(testevent,"packet",dl);
 	else
-		rv=eventdel(testevent,"packet",dl);
+		eventdel(testevent,"packet",dl);
 	return 0;
 }
 
-- 
2.11.4.GIT