]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Polish parse_address bracketing
authorAmos Jeffries <squid3@treenet.co.nz>
Fri, 2 Mar 2012 03:20:08 +0000 (20:20 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Fri, 2 Mar 2012 03:20:08 +0000 (20:20 -0700)
src/cache_cf.cc

index 2321b8524423c5e33d0f7e0f64a5f1e777a900a2..092b51c11721822b95ad5dc227c9192afacff571 100644 (file)
@@ -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