NEWS: cite --start-pos

[wget] / src / connect.c

diff --git a/src/connect.c b/src/connect.c
index 34b40abc5abcfb225a043f88ee55df8f5e0a5b0c..bfb079b78b544b242ae68302edd18a2db093fcbb 100644 (file)
--- a/src/connect.c
+++ b/src/connect.c
@@ -36,13 +36,8 @@ as that of the covered work.  */
 #include <unistd.h>
 #include <assert.h>
 
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif /* def HAVE_SYS_SOCKET_H */
-
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif /* def HAVE_SYS_SELECT_H */
+#include <sys/socket.h>
+#include <sys/select.h>
 
 #ifndef WINDOWS
 # ifdef __VMS
@@ -58,9 +53,7 @@ as that of the covered work.  */
 
 #include <errno.h>
 #include <string.h>
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
+#include <sys/time.h>
 #include "utils.h"
 #include "host.h"
 #include "connect.h"
@@ -301,8 +294,10 @@ connect_to_ip (const ip_address *ip, int port, const char *print)
        {
            if (ip->family == AF_INET)
                logprintf (LOG_VERBOSE, _("Connecting to %s:%d... "), txt_addr, port);
+#ifdef ENABLE_IPV6
            else if (ip->family == AF_INET6)
                logprintf (LOG_VERBOSE, _("Connecting to [%s]:%d... "), txt_addr, port);
+#endif
        }
     }
 
@@ -564,6 +559,7 @@ socket_ip_address (int sock, ip_address *ip, int endpoint)
   if (ret < 0)
     return false;
 
+  memset(ip, 0, sizeof(ip_address));
   ip->family = sockaddr->sa_family;
   switch (sockaddr->sa_family)
     {