From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 2 Mar 2012 03:20:08 +0000 (-0700)
Subject: Polish parse_address bracketing
X-Git-Tag: BumpSslServerFirst.take06~2^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f2665ee3a0b280e9ce9bf914ed09c6794b219a4;p=thirdparty%2Fsquid.git

Polish parse_address bracketing
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 2321b85244..092b51c117 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1334,19 +1334,14 @@ parse_address(Ip::Address *addr)
         return;
     }
 
-    if (!strcmp(token,"any_addr")) {
+    if (!strcmp(token,"any_addr"))
         addr->SetAnyAddr();
-        (void) 0;
-    } else if ( (!strcmp(token,"no_addr")) || (!strcmp(token,"full_mask")) ) {
+    else if ( (!strcmp(token,"no_addr")) || (!strcmp(token,"full_mask")) )
         addr->SetNoAddr();
+    else if ( (*addr = token) ) // try parse numeric/IPA
         (void) 0;
-    } else if ( (*addr = token) ) // try parse numeric/IPA
-        (void) 0;
-    } else if ( addr->GetHostByName(token) ) // dont use ipcache
-        (void) 0;
-    } else {
-        self_destruct();
-    }
+    else
+        addr->GetHostByName(token); // dont use ipcache
 }
 
 static void