[svn] Update FSF's address and copyright years.

[wget] / src / connect.c

diff --git a/src/connect.c b/src/connect.c
index 5ce6f1dfe5de8fefa7c445c0fbd5b7bff945a5ea..295aeb8bbdecb79e4956ff35ab30396a9faf1df8 100644 (file)
--- a/src/connect.c
+++ b/src/connect.c
@@ -1,5 +1,5 @@
 /* Establishing and handling network connections.
-   Copyright (C) 1995, 1996, 1997, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1996-2005 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -14,8 +14,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+along with Wget; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the
@@ -263,7 +263,7 @@ connect_to_ip (const ip_address *ip, int port, const char *print)
      PRINT being the host name we're connecting to.  */
   if (print)
     {
-      const char *txt_addr = pretty_print_address (ip);
+      const char *txt_addr = print_address (ip);
       if (print && 0 != strcmp (print, txt_addr))
        logprintf (LOG_VERBOSE, _("Connecting to %s|%s|:%d... "),
                   escnonprint (print), txt_addr, port);
@@ -460,8 +460,8 @@ bind_local (const ip_address *bind_address, int *port)
          return -1;
        }
       sockaddr_get_data (sa, NULL, port);
-      DEBUGP (("binding to address %s using port %i.\n", 
-              pretty_print_address (bind_address), *port));
+      DEBUGP (("binding to address %s using port %i.\n",
+              print_address (bind_address), *port));
     }
   if (listen (sock, 1) < 0)
     {
@@ -540,7 +540,7 @@ socket_ip_address (int sock, ip_address *ip, int endpoint)
 #ifdef HAVE_SOCKADDR_IN6_SCOPE_ID
        ADDRESS_IPV6_SCOPE (ip) = sa6->sin6_scope_id;
 #endif
-       DEBUGP (("conaddr is: %s\n", pretty_print_address (ip)));
+       DEBUGP (("conaddr is: %s\n", print_address (ip)));
        return true;
       }
 #endif
@@ -549,7 +549,7 @@ socket_ip_address (int sock, ip_address *ip, int endpoint)
        struct sockaddr_in *sa = (struct sockaddr_in *)&storage;
        ip->type = IPV4_ADDRESS;
        ADDRESS_IPV4_IN_ADDR (ip) = sa->sin_addr;
-       DEBUGP (("conaddr is: %s\n", pretty_print_address (ip)));
+       DEBUGP (("conaddr is: %s\n", print_address (ip)));
        return true;
       }
     default: