------------------------------------------------------------ revno: 12358 revision-id: squid3@treenet.co.nz-20121013060236-epnz84nafzalpp0k parent: squid3@treenet.co.nz-20121013060101-1jtmo1c2rzca4hr3 committer: Amos Jeffries branch nick: 3.3 timestamp: Sat 2012-10-13 00:02:36 -0600 message: Fix using assignment as a condition without parentheses ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20121013060236-epnz84nafzalpp0k # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: 50bd2d671061226b3994ad03f722d30684018b5c # timestamp: 2012-10-13 06:07:38 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20121013060101-\ # 1jtmo1c2rzca4hr3 # # Begin patch === modified file 'src/ipcache.cc' --- src/ipcache.cc 2012-09-04 09:10:20 +0000 +++ src/ipcache.cc 2012-10-13 06:02:36 +0000 @@ -434,7 +434,7 @@ memset(i->addrs.bad_mask, 0, sizeof(unsigned char) * ipcount); for (j = 0, k = 0; k < ipcount; ++k) { - if ( i->addrs.in_addrs[j] = A[k] ) + if ((i->addrs.in_addrs[j] = A[k])) ++j; else debugs(14, DBG_IMPORTANT, "ipcacheParse: Invalid IP address '" << A[k] << "' in response to '" << name << "'");