From: Alex Rousskov Date: Wed, 13 Dec 2023 12:01:02 +0000 (+0000) Subject: Source Format Enforcement (#1618) X-Git-Tag: SQUID_7_0_1~256 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab2acef61068dea8bd22e39f2d9643b08b3bf7a6;p=thirdparty%2Fsquid.git Source Format Enforcement (#1618) --- diff --git a/src/Notes.h b/src/Notes.h index 18cd9f71ca..eb264ea075 100644 --- a/src/Notes.h +++ b/src/Notes.h @@ -11,9 +11,9 @@ #include "acl/forward.h" #include "base/RefCount.h" -#include "sbuf/forward.h" #include "format/Format.h" #include "mem/forward.h" +#include "sbuf/forward.h" #include "SquidString.h" #include diff --git a/src/acl/Acl.cc b/src/acl/Acl.cc index 63c6bff3ec..376f252154 100644 --- a/src/acl/Acl.cc +++ b/src/acl/Acl.cc @@ -329,8 +329,8 @@ ACL::dumpWhole(const char * const directiveName, std::ostream &os) // XXX: No lineOptions() call here because we do not remember ACL "line" // boundaries and associated "line" options; we cannot report them. os << directiveName << ' ' << name << ' ' << typeString() << options() << - asList(dump()).prefixedBy(" ").delimitedBy(" ") << - '\n'; + asList(dump()).prefixedBy(" ").delimitedBy(" ") << + '\n'; } /* ACL result caching routines */ diff --git a/src/helper.cc b/src/helper.cc index e54da6f361..197cd8f16a 100644 --- a/src/helper.cc +++ b/src/helper.cc @@ -295,7 +295,7 @@ Helper::Client::openSessions() commSetNonBlocking(wfd); AsyncCall::Pointer closeCall = asyncCall(5, 4, "Helper::Session::HelperServerClosed", cbdataDialer(SessionBase::HelperServerClosed, - static_cast(srv))); + static_cast(srv))); comm_add_close_handler(rfd, closeCall); @@ -429,7 +429,7 @@ statefulhelper::openSessions() commSetNonBlocking(wfd); AsyncCall::Pointer closeCall = asyncCall(5, 4, "helper_stateful_server::HelperServerClosed", cbdataDialer(Helper::SessionBase::HelperServerClosed, - static_cast(srv))); + static_cast(srv))); comm_add_close_handler(rfd, closeCall);