------------------------------------------------------------ revno: 13034 revision-id: squidadm@squid-cache.org-20131005001403-ub61jquyl0aela4r parent: kinkie@squid-cache.org-20131004145052-rsds7a2gasqufckb committer: Automatic source maintenance branch nick: trunk timestamp: Fri 2013-10-04 18:14:03 -0600 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20131005001403-\ # ub61jquyl0aela4r # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 3e0450b5a3fc69217b0900a76fbc5b963ce9cef9 # timestamp: 2013-10-05 00:59:48 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: kinkie@squid-cache.org-20131004145052-\ # rsds7a2gasqufckb # # Begin patch === modified file 'src/SBuf.cc' --- src/SBuf.cc 2013-10-04 13:55:21 +0000 +++ src/SBuf.cc 2013-10-05 00:14:03 +0000 @@ -291,7 +291,7 @@ sz = vsnprintf(space, spaceSize(), fmt, vargs); if (sz < 0) // output error in vsnprintf throw TextException("output error in second-go vsnprintf",__FILE__, - __LINE__); + __LINE__); } if (sz < 0) // output error in either vsnprintf @@ -308,7 +308,7 @@ if (!snPrintfTerminatorChecked) { char testbuf[16]; snPrintfTerminatorCounted = snprintf(testbuf, sizeof(testbuf), - "%s", "1") == 2; + "%s", "1") == 2; snPrintfTerminatorChecked = true; } if (snPrintfTerminatorCounted) { @@ -604,7 +604,7 @@ char needleBegin = needle[0]; debugs(24, 7, "looking for " << needle << "starting at " << startPos << - " in id " << id); + " in id " << id); while (begin < lastPossible) { char *tmp; debugs(24, 8, " begin=" << (void *) begin <<