]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Wrap more g++ 4.3.0 located warnings
authorAmos Jeffries <squid3@treenet.co.nz>
Thu, 8 May 2008 03:37:45 +0000 (15:37 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Thu, 8 May 2008 03:37:45 +0000 (15:37 +1200)
lib/IPAddress.cc

index 36a26d431e303cf88bd5619c2024cc30784d2994..4dea87589b5f7dab3a939892e18ca9c7ed8372ce 100644 (file)
@@ -340,18 +340,20 @@ bool IPAddress::SetIPv4()
 bool IPAddress::IsLocalhost() const
 {
 #if USE_IPV6
-    return        m_SocketAddr.sin6_addr.s6_addr32[0] == 0
+    return    (   m_SocketAddr.sin6_addr.s6_addr32[0] == 0
                && m_SocketAddr.sin6_addr.s6_addr32[1] == 0
                && m_SocketAddr.sin6_addr.s6_addr32[2] == 0
                && m_SocketAddr.sin6_addr.s6_addr32[3] == htonl(0x1)
-
+              )
 #if !IPV6_SPECIAL_LOCALHOST
-               || m_SocketAddr.sin6_addr.s6_addr32[0] == 0
+            ||
+              (   m_SocketAddr.sin6_addr.s6_addr32[0] == 0
                && m_SocketAddr.sin6_addr.s6_addr32[1] == 0
                && m_SocketAddr.sin6_addr.s6_addr32[2] == htonl(0xffff)
                && m_SocketAddr.sin6_addr.s6_addr32[3] == htonl(0x7F000001)
+              )
 #endif
-               ;
+            ;
 #else
 
     return (htonl(0x7F000001) == m_SocketAddr.sin_addr.s_addr);