From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 8 Jul 2017 10:00:57 +0000 (+1200)
Subject: Remove unnecessary assert in NetDB
X-Git-Tag: SQUID_4_0_22~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1da59ec6e6f7d34f2b5a6d44dcb2d328ca9281b6;p=thirdparty%2Fsquid.git

Remove unnecessary assert in NetDB
---

diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc
index 11078d3196..f47d9d279d 100644
--- a/src/icmp/net_db.cc
+++ b/src/icmp/net_db.cc
@@ -1284,13 +1284,12 @@ netdbExchangeStart(void *data)
     CachePeer *p = (CachePeer *)data;
     static const SBuf netDB("netdb");
     char *uri = internalRemoteUri(p->host, p->http_port, "/squid-internal-dynamic/", netDB);
-    debugs(38, 3, "netdbExchangeStart: Requesting '" << uri << "'");
-    assert(NULL != uri);
+    debugs(38, 3, "Requesting '" << uri << "'");
     const MasterXaction::Pointer mx = new MasterXaction(XactionInitiator::initIcmp);
     HttpRequest *req = HttpRequest::FromUrl(uri, mx);
 
-    if (req == NULL) {
-        debugs(38, DBG_IMPORTANT, "netdbExchangeStart: Bad URI " << uri);
+    if (!req) {
+        debugs(38, DBG_IMPORTANT, MYNAME << ": Bad URI " << uri);
         return;
     }