changeset 4538:8e383f84ebd0 draft

Remove now unused variables.
author Roy Marples <roy@marples.name>
date Wed, 19 Jun 2019 10:41:06 +0000
parents 37f793c7948e
children 3d212cac74d3
files src/dhcp-common.c src/dhcp.c src/dhcp6.c
diffstat 3 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/dhcp-common.c	Tue Jun 18 17:37:04 2019 +0100
+++ b/src/dhcp-common.c	Wed Jun 19 10:41:06 2019 +0000
@@ -627,7 +627,7 @@
 	uint32_t u32;
 	int32_t s32;
 	struct in_addr addr;
-	ssize_t bytes = 0, sl;
+	ssize_t sl;
 	size_t l;
 
 	/* Ensure a valid length */
@@ -679,7 +679,6 @@
 	if (opt->type & OT_BITFLAG) {
 		/* bitflags are a string, MSB first, such as ABCDEFGH
 		 * where A is 10000000, B is 01000000, etc. */
-		bytes = 0;
 		for (l = 0, sl = sizeof(opt->bitflags) - 1;
 		    l < sizeof(opt->bitflags);
 		    l++, sl--)
--- a/src/dhcp.c	Tue Jun 18 17:37:04 2019 +0100
+++ b/src/dhcp.c	Wed Jun 19 10:41:06 2019 +0000
@@ -1290,12 +1290,11 @@
 	struct in_addr net;
 	struct in_addr brd;
 	struct dhcp_opt *opt, *vo;
-	size_t e, i, pl;
+	size_t i, pl;
 	char safe[(BOOTP_FILE_LEN * 4) + 1];
 	uint8_t overl = 0;
 	uint32_t en;
 
-	e = 0;
 	ifo = ifp->options;
 	if (get_option_uint8(ifp->ctx, &overl, bootp, bootp_len,
 	    DHO_OPTSOVERLOADED) == -1)
--- a/src/dhcp6.c	Tue Jun 18 17:37:04 2019 +0100
+++ b/src/dhcp6.c	Wed Jun 19 10:41:06 2019 +0000
@@ -3959,7 +3959,7 @@
 	struct dhcp_opt *opt, *vo;
 	const uint8_t *p;
 	struct dhcp6_option o;
-	size_t i, n;
+	size_t i;
 	char *pfx;
 	uint32_t en;
 	const struct dhcpcd_ctx *ctx;
@@ -3968,7 +3968,6 @@
 	const struct ipv6_addr *ap;
 #endif
 
-	n = 0;
 	if (m == NULL)
 		goto delegated;