Don't do if (foo) when foo is a char array and not a pointer

diff --git a/Makefile b/Makefile
index 4dd51dcf81e69ae13a2eb8c1bd326fbb128e8245..da6410303cc9aaa3090c210aafe0166e147d6d9c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Should work for both GNU make and BSD mke
 
-VERSION = 3.0.2
+VERSION = 3.0.3_pre1
 
 INSTALL ?= install
 CFLAGS ?= -Wall -O2 -pedantic -std=gnu99

diff --git a/configure.c b/configure.c
index 11216d42fe10240f0eae697b80f3bcc637075ce7..f2fe22338b7dd078ae609ef80f0ac1d7d49940af 100644 (file)
--- a/configure.c
+++ b/configure.c
@@ -103,7 +103,7 @@ static int make_resolv (char *ifname, dhcp_t *dhcp)
   char resolvconf[PATH_MAX];
   address_t *address;
 
-  memset (&resolvconf, 0, sizeof (resolvconf));
+  memset (&buf, 0, sizeof (struct stat));
   if (stat ("/sbin/resolvconf", &buf) == 0)
     {
       logger (LOG_DEBUG, "sending DNS information to resolvconf");
@@ -132,7 +132,7 @@ static int make_resolv (char *ifname, dhcp_t *dhcp)
       for (address = dhcp->dnsservers; address; address = address->next)
        fprintf (f, "nameserver %s\n", inet_ntoa (address->address));
 
-      if (resolvconf)
+      if (buf.st_ino)
        {
          pclose (f);
          logger (LOG_DEBUG, "resolvconf completed");

diff --git a/interface.c b/interface.c
index 16d4ed48d1366865c6ad9a41778b3e227bbb31c3..75b088d2d0cf92f563213c0eac2e4739ab2c5b5c 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -127,7 +127,7 @@ interface_t *read_interface (const char *ifname, int metric)
          return NULL;
        }
 
-      memcpy (hwaddr, sdl->sdl_data + sdl->sdl_nlen, ETHER_ADDR_LEN);
+      memcpy (&hwaddr, sdl->sdl_data + sdl->sdl_nlen, ETHER_ADDR_LEN);
       break;
     }
   freeifaddrs (ifap);