------------------------------------------------------------ revno: 14059 revision-id: squidadm@squid-cache.org-20160616001416-jb7a6qq30tm5gpoc parent: squid3@treenet.co.nz-20160615220816-yqh6bmry6ijvfwi1 committer: Source Maintenance branch nick: 3.5 timestamp: Thu 2016-06-16 00:14:16 +0000 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20160616001416-\ # jb7a6qq30tm5gpoc # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: 222d2b2638e1aae18afd737bbdf56623ee8ecab3 # timestamp: 2016-06-16 00:51:03 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20160615220816-\ # yqh6bmry6ijvfwi1 # # Begin patch === modified file 'src/adaptation/ecap/Host.cc' --- src/adaptation/ecap/Host.cc 2016-06-15 22:08:16 +0000 +++ src/adaptation/ecap/Host.cc 2016-06-16 00:14:16 +0000 @@ -148,8 +148,8 @@ const int squidLevel = SquidLogLevel(lv); const int squidSection = 93; // XXX: this should be a global constant return Debug::Enabled(squidSection, squidLevel) ? - &Debug::Start(squidSection, squidLevel) : - NULL; + &Debug::Start(squidSection, squidLevel) : + NULL; } void === modified file 'src/debug.cc' --- src/debug.cc 2016-06-15 22:08:16 +0000 +++ src/debug.cc 2016-06-16 00:14:16 +0000 @@ -729,7 +729,7 @@ level = aLevel; sectionLevel = Levels[aSection]; assert(upper == Current); - + buf.str(std::string()); buf.clear(); // debugs() users are supposed to preserve format, but