Clean ups

diff --git a/Makefile b/Makefile
index 578b521d987dc3d3f7799f2fa2fc66040c9aeb52..9a58169f422dba95beeda579b620bf328ef7ff8d 100644 (file)
--- 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 4455f2682bd3042cdddfad46ed1a4731b761bf19..7aaa97012737253050368eca4fe5e2e82796b7e5 100644 (file)
--- 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 758336652abd0afbb33531de57e014bcfe13c639..7dce0500e54f40330ff18bf875a74deab799508d 100644 (file)
--- 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 0a50ed36fc9e8b9dcdbc8cdbacbc7a9bc3733420..53b4be6d87afa4658bf5539a8a33db4aeea5aef3 100644 (file)
--- 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 ba94215e8228397b7058e6cd9a43ee216eeef10c..35ba658678cf22b6a61d2aed2bb9e0582b59c3b9 100644 (file)
--- 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>