From: Source Maintenance Date: Thu, 19 Feb 2015 18:12:06 +0000 (+0000) Subject: SourceFormat Enforcement X-Git-Tag: merge-candidate-3-v1~256 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1bb95576aa971d103900e942a48ef5073009e555;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/doc/debug-sections.txt b/doc/debug-sections.txt index 5d71e97d34..5bcf776fe1 100644 --- a/doc/debug-sections.txt +++ b/doc/debug-sections.txt @@ -57,6 +57,7 @@ section 21 Time Functions section 22 Refresh Calculation section 23 URL Parsing section 23 URL Scheme parsing +section 24 SBuf section 25 MiME Header Parsing section 25 MIME Parsing and Internal Icons section 26 Secure Sockets Layer Proxy diff --git a/src/SBuf.h b/src/SBuf.h index 79a73a9942..12d2c75db7 100644 --- a/src/SBuf.h +++ b/src/SBuf.h @@ -140,7 +140,9 @@ public: SBuf(const SBuf &S); SBuf(SBuf&& S) : store_(std::move(S.store_)), off_(S.off_), len_(S.len_) { ++stats.moves; - S.store_=NULL; S.off_=0; S.len_=0; //RefCount supports NULL + S.store_=NULL; + S.off_=0; + S.len_=0; //RefCount supports NULL } /** Constructor: import c-style string diff --git a/src/parser/Tokenizer.cc b/src/parser/Tokenizer.cc index d5e83bdd6a..8581e83c60 100644 --- a/src/parser/Tokenizer.cc +++ b/src/parser/Tokenizer.cc @@ -71,7 +71,7 @@ Parser::Tokenizer::token(SBuf &returnedToken, const CharacterSet &delimiters) returnedToken = consume(tokenLen); // cannot be empty skipAll(delimiters); debugs(24, DBG_DATA, "token found for delimiters " << delimiters.name << ": '" << - returnedToken << '\''); + returnedToken << '\''); return true; } diff --git a/src/tests/stub_debug.cc b/src/tests/stub_debug.cc index 5cd6f178e4..5019a22e04 100644 --- a/src/tests/stub_debug.cc +++ b/src/tests/stub_debug.cc @@ -115,7 +115,7 @@ void Debug::xassert(const char *msg, const char *file, int line) { getDebugOut() << "assertion failed: " << file << ":" << line << - ": \"" << msg << "\""; + ": \"" << msg << "\""; abort(); }