From dbcad5eb1a58e0ca8fb801bc8183150400f11c8a Mon Sep 17 00:00:00 2001
From: Reiner Herrmann <reiner@reiner-h.de>
Date: Wed, 14 Oct 2020 18:08:48 +0200
Subject: Remove unused variables

Fixes clang-analyzer warnings:
"Although the value stored to 'xxxxx' is used in the enclosing expression, the value is never actually read from 'xxxxx'"
---
 src/faudit/dbus.c      | 2 +-
 src/firejail/arp.c     | 8 +++-----
 src/firejail/network.c | 3 +--
 src/fnet/arp.c         | 4 +---
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/faudit/dbus.c b/src/faudit/dbus.c
index beaa5ac46..2a3c282d7 100644
--- a/src/faudit/dbus.c
+++ b/src/faudit/dbus.c
@@ -91,7 +91,7 @@ static char *test_dbus_env(char *env_var_name) {
 			if (!found)
 				errExit("strdup");
 		}
-		else if ((sockfile = strstr(bus, "tcp:host=")) != NULL)
+		else if (strstr(bus, "tcp:host=") != NULL)
 			printf("UGLY: %s bus configured for TCP communication.\n", env_var_name);
 		else
 			printf("GOOD: cannot find a %s D-Bus socket\n", env_var_name);
diff --git a/src/firejail/arp.c b/src/firejail/arp.c
index f88d0a1dd..69d872110 100644
--- a/src/firejail/arp.c
+++ b/src/firejail/arp.c
@@ -105,8 +105,7 @@ void arp_announce(const char *dev, Bridge *br) {
 	if ((sock = socket(PF_PACKET, SOCK_RAW, htons (ETH_P_ALL))) < 0)
 		errExit("socket");
 
-	int len;
-	if ((len = sendto (sock, frame, 14 + sizeof(ArpHdr), 0, (struct sockaddr *) &addr, sizeof (addr))) <= 0)
+	if (sendto (sock, frame, 14 + sizeof(ArpHdr), 0, (struct sockaddr *) &addr, sizeof (addr)) <= 0)
 		errExit("send");
 	fflush(0);
 	close(sock);
@@ -177,8 +176,7 @@ int arp_check(const char *dev, uint32_t destaddr) {
 	if ((sock = socket(PF_PACKET, SOCK_RAW, htons (ETH_P_ALL))) < 0)
 		errExit("socket");
 
-	int len;
-	if ((len = sendto (sock, frame, 14 + sizeof(ArpHdr), 0, (struct sockaddr *) &addr, sizeof (addr))) <= 0)
+	if (sendto (sock, frame, 14 + sizeof(ArpHdr), 0, (struct sockaddr *) &addr, sizeof (addr)) <= 0)
 		errExit("send");
 	fflush(0);
 
@@ -201,7 +199,7 @@ int arp_check(const char *dev, uint32_t destaddr) {
 				close(sock);
 				return 0;
 			}
-			if ((len = sendto (sock, frame, 14 + sizeof(ArpHdr), 0, (struct sockaddr *) &addr, sizeof (addr))) <= 0)
+			if (sendto (sock, frame, 14 + sizeof(ArpHdr), 0, (struct sockaddr *) &addr, sizeof (addr)) <= 0)
 				errExit("send");
 			ts.tv_sec = 0; // 0.5 seconds wait time
 			ts.tv_usec = 500000;
diff --git a/src/firejail/network.c b/src/firejail/network.c
index aa05e3bd0..8cdf04947 100644
--- a/src/firejail/network.c
+++ b/src/firejail/network.c
@@ -183,7 +183,6 @@ int net_add_route(uint32_t ip, uint32_t mask, uint32_t gw) {
 	int sock;
 	struct rtentry route;
 	struct sockaddr_in *addr;
-	int err = 0;
 
 	// create the socket
 	if((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
@@ -205,7 +204,7 @@ int net_add_route(uint32_t ip, uint32_t mask, uint32_t gw) {
 
 	route.rt_flags = RTF_UP | RTF_GATEWAY;
 	route.rt_metric = 0;
-	if ((err = ioctl(sock, SIOCADDRT, &route)) != 0) {
+	if (ioctl(sock, SIOCADDRT, &route) != 0) {
 		close(sock);
 		return -1;
 	}
diff --git a/src/fnet/arp.c b/src/fnet/arp.c
index 122d0007c..64f177574 100644
--- a/src/fnet/arp.c
+++ b/src/fnet/arp.c
@@ -149,10 +149,8 @@ void arp_scan(const char *dev, uint32_t ifip, uint32_t ifmask) {
 			memcpy (frame + 14, &hdr, sizeof(hdr));
 
 			// send packet
-			int len;
-			if ((len = sendto (sock, frame, 14 + sizeof(ArpHdr), 0, (struct sockaddr *) &addr, sizeof (addr))) <= 0)
+			if (sendto (sock, frame, 14 + sizeof(ArpHdr), 0, (struct sockaddr *) &addr, sizeof (addr)) <= 0)
 				errExit("send");
-//printf("send %d bytes to %d.%d.%d.%d\n", len, PRINT_IP(dest));
 			fflush(0);
 			dest++;
 		}
-- 
cgit v1.2.3-54-g00ecf