From: Roy Marples <roy@marples.name>
Date: Fri, 12 Oct 2012 11:26:20 +0000 (+0000)
Subject: Fix code for -Wstrict-overflow
X-Git-Tag: v5.99.3~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f29cbe614f253163a87b6065b918a4dcefaead0d;p=thirdparty%2Fdhcpcd.git

Fix code for -Wstrict-overflow
---

diff --git a/configure b/configure
index 7e3bfafe..c8e3bde9 100755
--- a/configure
+++ b/configure
@@ -224,7 +224,7 @@ CFLAGS+=	-Wmissing-prototypes -Wmissing-declarations
 CFLAGS+=	-Wmissing-noreturn -Wmissing-format-attribute
 CFLAGS+=	-Wredundant-decls  -Wnested-externs
 CFLAGS+=	-Winline -Wwrite-strings -Wcast-align -Wcast-qual
-CFLAGS+=	-Wpointer-arith
+CFLAGS+=	-Wpointer-arith -Wstrict-overflow
 CFLAGS+=	-Wdeclaration-after-statement -Wsequence-point
 CFLAGS+=	-fno-common
 EOF
diff --git a/dhcpcd.c b/dhcpcd.c
index b124d1f5..f98fc8f1 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1784,7 +1784,8 @@ int
 main(int argc, char **argv)
 {
 	struct interface *iface;
-	int opt, oi = 0, signal_fd, sig = 0, i, control_fd, family = 0;
+	uint16_t family = 0;
+	int opt, oi = 0, signal_fd, sig = 0, i, control_fd;
 	size_t len;
 	pid_t pid;
 	struct timespec ts;
diff --git a/ipv6rs.c b/ipv6rs.c
index 211f1aba..57cbcf22 100644
--- a/ipv6rs.c
+++ b/ipv6rs.c
@@ -385,7 +385,7 @@ ipv6rs_handledata(_unused void *arg)
 	struct ipv6_addr *ap;
 	char *opt, *tmp;
 	struct timeval expire;
-	int has_dns, new_rap, new_data;
+	uint8_t has_dns, new_rap, new_data;
 
 	len = recvmsg(sock, &rcvhdr, 0);
 	if (len == -1) {