Attempt merging from 6.3.24.

[~andy/fetchmail] / interface.c

diff --git a/interface.c b/interface.c
index 05efe63490617ae2255309dc1e04cf993edb8f84..f9445cb8aba1a01948dc50beb25aed0445146ae3 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -230,7 +230,6 @@ get_ifinfo(const char *ifname, ifinfo_t *ifinfo)
        struct ifaddr           ifaddr;
        unsigned long           ifaddr_addr;
        struct sockaddr         sa;
-       unsigned long           sa_addr;
        uint                    i;
        
        if (if_egid)
@@ -360,7 +359,7 @@ get_ifinfo(const char *ifname, ifinfo_t *ifinfo)
     char               iname[16];
     int                        mib[6];
 
-    memset(ifinfo, 0, sizeof(ifinfo));
+    memset(ifinfo, 0, sizeof(*ifinfo));
 
     /* trim interface name */