---------------------
PatchSet 4113 
Date: 2007/03/23 06:57:33
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Backup some more old conversion code not needed in patch.

Members: 
	src/ipcache.cc:1.9.2.15->1.9.2.16 

Index: squid3/src/ipcache.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ipcache.cc,v
retrieving revision 1.9.2.15
retrieving revision 1.9.2.16
diff -u -r1.9.2.15 -r1.9.2.16
--- squid3/src/ipcache.cc	9 Mar 2007 11:46:30 -0000	1.9.2.15
+++ squid3/src/ipcache.cc	23 Mar 2007 06:57:33 -0000	1.9.2.16
@@ -1,5 +1,6 @@
+
 /*
- * $Id: ipcache.cc,v 1.9.2.15 2007/03/09 11:46:30 amosjeffries Exp $
+ * $Id: ipcache.cc,v 1.9.2.16 2007/03/23 06:57:33 amosjeffries Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -123,7 +124,7 @@
         return 1;
 
     for (; w; w = w->next) {
-        if (GETHOSTBYNAME(w->key) != NULL)
+        if (gethostbyname(w->key) != NULL)
             return 1;
     }
 
@@ -836,7 +837,7 @@
     }
 
     debug(14, 3) ("ipcacheCycleAddr: %s now at %s\n", name,
-                  INET_NTOA(ia->in_addrs[ia->cur]));
+                  inet_ntoa(ia->in_addrs[ia->cur]));
 }
 
 /*
@@ -951,7 +952,7 @@
 
     struct IN_ADDR ip;
 
-    if (!SAFE_INET_ADDR(ipaddr, &ip)) {
+    if (!safe_inet_addr(ipaddr, &ip)) {
 #ifndef INET6
         if (strchr(ipaddr, ':') && strspn(ipaddr, "0123456789abcdefABCDEF:") == strlen(ipaddr)) {
             debug(14, 3) ("ipcacheAddEntryFromHosts: Skipping IPv6 address '%s'\n", ipaddr);