diff lib/protocols.c @ 641:efe90b739e98

2004-12-12 Brian Masney <masneyb@gftp.org> * lib/gftp.h lib/protocols.c (gftp_connect_server) - if getaddrinfo() is not defined in the system, save the current index of the host that we are connected to
author masneyb
date Sun, 12 Dec 2004 11:52:17 +0000
parents ddf1ec822538
children cd38f25b7c5e
line wrap: on
line diff
--- a/lib/protocols.c	Sun Dec 12 11:26:15 2004 +0000
+++ b/lib/protocols.c	Sun Dec 12 11:52:17 2004 +0000
@@ -2240,7 +2240,6 @@
 #else /* !HAVE_GETADDRINFO */
   struct sockaddr_in remote_address;
   struct servent serv_struct;
-  int curhost;
 
   if ((request->use_proxy = gftp_need_proxy (request, service,
                                              proxy_hostname, proxy_port)) < 0)
@@ -2306,10 +2305,13 @@
     }
 
   disphost = NULL;
-  for (curhost = 0; request->host.h_addr_list[curhost] != NULL; curhost++)
+  for (request->curhost = 0;
+       request->host.h_addr_list[request->curhost] != NULL;
+       request->curhost++)
     {
       disphost = request->host.h_name;
-      memcpy (&remote_address.sin_addr, request->host.h_addr_list[curhost],
+      memcpy (&remote_address.sin_addr,
+              request->host.h_addr_list[request->curhost],
               request->host.h_length);
       request->logging_function (gftp_logging_misc, request,
                                  _("Trying %s:%d\n"),
@@ -2325,7 +2327,7 @@
       break;
     }
 
-  if (request->host.h_addr_list[curhost] == NULL)
+  if (request->host.h_addr_list[request->curhost] == NULL)
     {
       close (sock);
       return (GFTP_ERETRYABLE);