From: Roy Marples <roy@marples.name>
Date: Thu, 5 Apr 2007 15:01:50 +0000 (+0000)
Subject: Clean ups
X-Git-Tag: v3.2.3~293
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=505951cbf0e61e07f4452addf17680c3db6a0409;p=thirdparty%2Fdhcpcd.git

Clean ups
---

diff --git a/Makefile b/Makefile
index 578b521d..9a58169f 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ CFLAGS ?= -O2 -pipe
 # IMPORTANT: We should be using c99 instead of gnu99 but for some reason
 # generic linux headers as of 2.6.19 don't allow this in asm/types.h
 CFLAGS += -pedantic -std=gnu99 \
-    -Wall -Wextra -Wunused -Wimplicit -Wshadow -Wformat=2 \
+    -Wall -Wunused -Wimplicit -Wshadow -Wformat=2 \
     -Wmissing-declarations -Wno-missing-prototypes -Wwrite-strings \
     -Wbad-function-cast -Wnested-externs -Wcomment -Winline \
     -Wchar-subscripts -Wcast-align -Wno-format-nonliteral
diff --git a/client.c b/client.c
index 4455f268..7aaa9701 100644
--- a/client.c
+++ b/client.c
@@ -248,7 +248,6 @@ int dhcp_run (const options_t *options)
 	{
 	  switch (sig)
 	    {
-	      break;
 	    case SIGINT:
 	      logger (LOG_INFO, "received SIGINT, stopping");
 	      retval = (! daemonised);
diff --git a/interface.c b/interface.c
index 75833665..7dce0500 100644
--- a/interface.c
+++ b/interface.c
@@ -134,7 +134,7 @@ interface_t *read_interface (const char *ifname, int metric)
   interface_t *iface;
   unsigned char hwaddr[16];
   int hwlen = 0;
-  sa_family_t family;
+  sa_family_t family = 0;
   unsigned short mtu;
 
 #ifndef __linux__
diff --git a/signals.c b/signals.c
index 0a50ed36..53b4be6d 100644
--- a/signals.c
+++ b/signals.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/select.h>
 #include <sys/wait.h>
diff --git a/socket.c b/socket.c
index ba94215e..35ba6586 100644
--- a/socket.c
+++ b/socket.c
@@ -24,8 +24,8 @@
 #include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
-#include <arpa/inet.h>
 #include <netinet/in_systm.h>
+#include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/udp.h>
 #include <netinet/if_ether.h>
@@ -34,6 +34,7 @@
 #include <net/if_types.h>
 #endif
 #include <net/if.h>
+#include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>