[nginx] svn commit: r4629 - trunk/src/http

[ru at nginx.com]

Author: ru
Date: 2012-05-14 15:52:37 +0000 (Mon, 14 May 2012)
New Revision: 4629
URL: http://trac.nginx.org/nginx/changeset/4629/nginx

Log:
Reverted previous attempt to fix complation warning introduced in
r4624 and actually fixed it.


Modified:
   trunk/src/http/ngx_http_core_module.c

Modified: trunk/src/http/ngx_http_core_module.c
===================================================================
--- trunk/src/http/ngx_http_core_module.c	2012-05-14 14:00:17 UTC (rev 4628)
+++ trunk/src/http/ngx_http_core_module.c	2012-05-14 15:52:37 UTC (rev 4629)
@@ -2713,31 +2713,30 @@
     struct in6_addr  *inaddr6;
 #endif
 
+#if (NGX_SUPPRESS_WARN)
+    inaddr = NULL;
+#if (NGX_HAVE_INET6)
+    inaddr6 = NULL;
+#endif
+#endif
+
     family = addr->sockaddr->sa_family;
 
-    switch (family) {
+    if (family == AF_INET) {
+        inaddr = &((struct sockaddr_in *) addr->sockaddr)->sin_addr.s_addr;
+    }
 
 #if (NGX_HAVE_INET6)
-    case AF_INET6:
+    else if (family == AF_INET6) {
         inaddr6 = &((struct sockaddr_in6 *) addr->sockaddr)->sin6_addr;
 
         if (IN6_IS_ADDR_V4MAPPED(inaddr6)) {
             family = AF_INET;
             inaddr = (in_addr_t *) &inaddr6->s6_addr[12];
         }
-
-        break;
+    }
 #endif
 
-#if (NGX_HAVE_UNIX_DOMAIN)
-    case AF_UNIX:
-        break;
-#endif
-
-    default: /* AF_INET */
-        inaddr = &((struct sockaddr_in *) addr->sockaddr)->sin_addr.s_addr;
-    }
-
     for (cidr = proxies->elts, i = 0; i < proxies->nelts; i++) {
         if (cidr[i].family != family) {
             goto next;