------------------------------------------------------------ revno: 13771 revision-id: squid3@treenet.co.nz-20150313112418-rlzd5hcmkgxklybn parent: squidadm@squid-cache.org-20150303181415-6fz0w41gzuw6dvz9 committer: Amos Jeffries branch nick: 3.5 timestamp: Fri 2015-03-13 04:24:18 -0700 message: Remove useless checks in rev.13767 Being overly paranoid it seems. Detected by Coverity Scan. Issue 1273436 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20150313112418-rlzd5hcmkgxklybn # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: b58ddbc99be59092e70cb3b7ec425be4e5cc1277 # timestamp: 2015-03-13 11:24:56 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squidadm@squid-cache.org-20150303181415-\ # 6fz0w41gzuw6dvz9 # # Begin patch === modified file 'src/tunnel.cc' --- src/tunnel.cc 2015-03-03 18:14:15 +0000 +++ src/tunnel.cc 2015-03-13 11:24:18 +0000 @@ -692,9 +692,8 @@ { if (!data) return; + TunnelStateData *tunnel = static_cast(data); - if (!tunnel) - return; tunnel->client.readPending = NULL; static uint64_t counter=0; debugs(26, 7, "Client read(2) delayed " << ++counter << " times"); @@ -706,9 +705,8 @@ { if (!data) return; + TunnelStateData *tunnel = static_cast(data); - if (!tunnel) - return; tunnel->server.readPending = NULL; static uint64_t counter=0; debugs(26, 7, "Server read(2) delayed " << ++counter << " times");