apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@apache.org
Subject svn commit: r111511 - /apr/apr/trunk/network_io/unix/sockaddr.c
Date Fri, 10 Dec 2004 15:19:21 GMT
Author: dreid
Date: Fri Dec 10 07:19:19 2004
New Revision: 111511

URL: http://svn.apache.org/viewcvs?view=rev&rev=111511
Log:
s/AF_UNSPEC/APR_UNSPEC/

Proposed by: Ingo Weinhold <bonefish at cs dot tu-berlin dot de>
Reviewed by: David Reid


Modified:
   apr/apr/trunk/network_io/unix/sockaddr.c

Modified: apr/apr/trunk/network_io/unix/sockaddr.c
Url: http://svn.apache.org/viewcvs/apr/apr/trunk/network_io/unix/sockaddr.c?view=diff&rev=111511&p1=apr/apr/trunk/network_io/unix/sockaddr.c&r1=111510&p2=apr/apr/trunk/network_io/unix/sockaddr.c&r2=111511
==============================================================================
--- apr/apr/trunk/network_io/unix/sockaddr.c	(original)
+++ apr/apr/trunk/network_io/unix/sockaddr.c	Fri Dec 10 07:19:19 2004
@@ -293,7 +293,7 @@
     hints.ai_family = family;
     hints.ai_socktype = SOCK_STREAM;
 #ifdef HAVE_GAI_ADDRCONFIG
-    if (family == AF_UNSPEC) {
+    if (family == APR_UNSPEC) {
         /* By default, only look up addresses using address types for
          * which a local interface is configured, i.e. no IPv6 if no
          * IPv6 interfaces configured. */
@@ -335,7 +335,7 @@
     }
     error = getaddrinfo(hostname, servname, &hints, &ai_list);
 #ifdef HAVE_GAI_ADDRCONFIG
-    if (error == EAI_BADFLAGS && family == AF_UNSPEC) {
+    if (error == EAI_BADFLAGS && family == APR_UNSPEC) {
         /* Retry with no flags if AI_ADDRCONFIG was rejected. */
         hints.ai_flags = 0;
         error = getaddrinfo(hostname, servname, &hints, &ai_list);
@@ -367,7 +367,7 @@
         apr_sockaddr_t *new_sa;
 
         /* Ignore anything bogus: getaddrinfo in some old versions of
-         * glibc will return AF_UNIX entries for AF_UNSPEC+AI_PASSIVE
+         * glibc will return AF_UNIX entries for APR_UNSPEC+AI_PASSIVE
          * lookups. */
         if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) {
             ai = ai->ai_next;
@@ -543,7 +543,7 @@
 
     if ((masked = flags & (APR_IPV4_ADDR_OK | APR_IPV6_ADDR_OK))) {
         if (!hostname ||
-            family != AF_UNSPEC ||
+            family != APR_UNSPEC ||
             masked == (APR_IPV4_ADDR_OK | APR_IPV6_ADDR_OK)) {
             return APR_EINVAL;
         }

Mime
View raw message