From 2bda2aa8855ff3ae42aba7aa86e1d7ff2b7a3b34 Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@tinc-vpn.org>
Date: Thu, 2 Jun 2011 18:22:26 +0200
Subject: [PATCH] Fix some compiler and cppcheck warnings.

---
 src/net_packet.c | 11 +++--------
 src/tincctl.c    |  5 ++---
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/net_packet.c b/src/net_packet.c
index 95f29617..1af5026a 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -56,7 +56,6 @@
 #include "xalloc.h"
 
 int keylifetime = 0;
-static int keyexpires = 0;
 #ifdef HAVE_LZO
 static char lzo_wrkmem[LZO1X_999_MEM_COMPRESS > LZO1X_1_MEM_COMPRESS ? LZO1X_999_MEM_COMPRESS : LZO1X_1_MEM_COMPRESS];
 #endif
@@ -255,7 +254,6 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
 	int nextpkt = 0;
 	vpn_packet_t *outpkt = pkt[0];
 	size_t outlen;
-	int i;
 
 	if(!cipher_active(&n->incipher)) {
 		ifdebug(TRAFFIC) logger(LOG_DEBUG, "Got packet from %s (%s) but he hasn't got our key yet",
@@ -318,7 +316,7 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
 					return;
 				}
 			} else {
-				for(i = n->received_seqno + 1; i < inpkt->seqno; i++)
+				for(int i = n->received_seqno + 1; i < inpkt->seqno; i++)
 					n->late[(i / 8) % replaywin] |= 1 << i % 8;
 			}
 		}
@@ -378,12 +376,12 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
 	vpn_packet_t *inpkt = origpkt;
 	int nextpkt = 0;
 	vpn_packet_t *outpkt;
-	int origlen;
+	int origlen = origpkt->len;
 	size_t outlen;
 #if defined(SOL_IP) && defined(IP_TOS)
 	static int priority = 0;
+	int origpriority = origpkt->priority;
 #endif
-	int origpriority;
 	int sock;
 
 	if(!n->status.reachable) {
@@ -423,9 +421,6 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
 		return;
 	}
 
-	origlen = inpkt->len;
-	origpriority = inpkt->priority;
-
 	/* Compress the packet */
 
 	if(n->outcompression) {
diff --git a/src/tincctl.c b/src/tincctl.c
index 6d7f03b8..4357d4a0 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -150,7 +150,6 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode) {
 	char *directory;
 	char buf[PATH_MAX];
 	char buf2[PATH_MAX];
-	size_t len;
 
 	/* Check stdin and stdout */
 	if(isatty(0) && isatty(1)) {
@@ -165,7 +164,7 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode) {
 			return NULL;
 		}
 
-		len = strlen(buf);
+		size_t len = strlen(buf);
 		if(len)
 			buf[--len] = 0;
 
@@ -488,7 +487,7 @@ int main(int argc, char *argv[], char *envp[]) {
 		fprintf(stderr, "Could not open control socket cookie file %s: %s\n", controlcookiename, strerror(errno));
 		return 1;
 	}
-	if(fscanf(f, "%1024s %128s %d", controlcookie, port, &pid) != 3) {
+	if(fscanf(f, "%1024s %128s %20d", controlcookie, port, &pid) != 3) {
 		fprintf(stderr, "Could not parse control socket cookie file %s\n", controlcookiename);
 		return 1;
 	}
-- 
2.39.5