Mercurial > hg > dhcpcd

changeset 2205:7ba4a529f157 draft dhcpcd-5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compile warnings
author Roy Marples <roy@marples.name>
date Sun, 22 Dec 2013 14:40:54 +0000
parents 36d2de733bcd
children
files dhcp.c dhcpcd.c ipv6rs.c
diffstat 3 files changed, 4 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/dhcp.c	Wed Mar 28 10:26:20 2012 +0000
+++ b/dhcp.c	Sun Dec 22 14:40:54 2013 +0000
@@ -1361,7 +1361,6 @@
 configure_env(char **env, const char *prefix, const struct dhcp_message *dhcp,
     const struct if_options *ifo)
 {
-	unsigned int i;
 	const uint8_t *p;
 	int pl;
 	struct in_addr addr;
@@ -1404,7 +1403,6 @@
 			net.s_addr = get_netmask(addr.s_addr);
 			setvar(&ep, prefix, "subnet_mask", inet_ntoa(net));
 		}
-		i = inet_ntocidr(net);
 		snprintf(cidr, sizeof(cidr), "%d", inet_ntocidr(net));
 		setvar(&ep, prefix, "subnet_cidr", cidr);
 		if (get_option_addr(&brd, dhcp, DHO_BROADCAST) == -1) {
--- a/dhcpcd.c	Wed Mar 28 10:26:20 2012 +0000
+++ b/dhcpcd.c	Sun Dec 22 14:40:54 2013 +0000
@@ -1499,12 +1499,12 @@
 static void
 handle_signal(_unused void *arg)
 {
-	struct interface *ifp, *ifl;
+	struct interface *ifp;
 	struct if_options *ifo;
 	int sig = signal_read();
-	int do_release, do_rebind, i;
+	int do_release, i;
 
-	do_rebind = do_release = 0;
+	do_release = 0;
 	switch (sig) {
 	case SIGINT:
 		syslog(LOG_INFO, "received SIGINT, stopping");
@@ -1561,11 +1561,9 @@
 	/* As drop_dhcp could re-arrange the order, we do it like this. */
 	for (;;) {
 		/* Be sane and drop the last config first */
-		ifl = NULL;
 		for (ifp = ifaces; ifp; ifp = ifp->next) {
 			if (ifp->next == NULL)
 				break;
-			ifl = ifp;
 		}
 		if (ifp == NULL)
 			break;
@@ -1582,7 +1580,7 @@
 handle_args(struct fd_list *fd, int argc, char **argv)
 {
 	struct interface *ifp;
-	int do_exit = 0, do_release = 0, do_reboot = 0, do_reconf = 0;
+	int do_exit = 0, do_release = 0, do_reboot = 0;
 	int opt, oi = 0;
 	ssize_t len;
 	size_t l;
@@ -1673,7 +1671,6 @@
 	{
 		switch (opt) {
 		case 'g':
-			do_reconf = 1;
 			break;
 		case 'k':
 			do_release = 1;
--- a/ipv6rs.c	Wed Mar 28 10:26:20 2012 +0000
+++ b/ipv6rs.c	Sun Dec 22 14:40:54 2013 +0000
@@ -684,12 +684,10 @@
 	struct ra_opt *rao, *raol, *raon;
 	struct timeval now, lt, expire, next;
 	int expired;
-	uint32_t expire_secs;
 
 	ifp = arg;
 	get_monotonic(&now);
 	expired = 0;
-	expire_secs = ~0U;
 	timerclear(&next);
 
 	for (rap = ifp->ras, ral = NULL;