From: Automatic source maintenance Date: Fri, 6 Jul 2012 00:22:24 +0000 (-0600) Subject: SourceFormat Enforcement X-Git-Tag: sourceformat-review-1~194 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d3abcb0d6e7a279e049934a498f1dd280128d43d;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc index 968d2da2f5..cd7a31cdf8 100644 --- a/src/HttpHeaderTools.cc +++ b/src/HttpHeaderTools.cc @@ -486,7 +486,7 @@ void header_mangler_clean(header_mangler &m) static void header_mangler_dump_access(StoreEntry * entry, const char *option, - const header_mangler &m, const char *name) + const header_mangler &m, const char *name) { if (m.access_list != NULL) { storeAppendPrintf(entry, "%s ", option); @@ -496,7 +496,7 @@ void header_mangler_dump_access(StoreEntry * entry, const char *option, static void header_mangler_dump_replacement(StoreEntry * entry, const char *option, - const header_mangler &m, const char *name) + const header_mangler &m, const char *name) { if (m.replacement) storeAppendPrintf(entry, "%s %s %s\n", option, name, m.replacement); @@ -567,8 +567,7 @@ HeaderManglers::track(const char *name) header_mangler *m = NULL; if (id == HDR_ENUM_END) { m = &all; - } else - if (id == HDR_BAD_HDR) { + } else if (id == HDR_BAD_HDR) { m = &custom[name]; } else { m = &known[id]; // including HDR_OTHER @@ -594,7 +593,7 @@ HeaderManglers::find(const HttpHeaderEntry &e) const { // a known header with a configured ACL list if (e.id != HDR_OTHER && 0 <= e.id && e.id < HDR_ENUM_END && - known[e.id].access_list) + known[e.id].access_list) return &known[e.id]; // a custom header diff --git a/src/HttpHeaderTools.h b/src/HttpHeaderTools.h index f9127ec52e..d2a6813a2b 100644 --- a/src/HttpHeaderTools.h +++ b/src/HttpHeaderTools.h @@ -18,7 +18,8 @@ typedef struct _header_mangler header_mangler; class StoreEntry; /// A collection of header_mangler objects for a given message kind. -class HeaderManglers { +class HeaderManglers +{ public: HeaderManglers(); ~HeaderManglers();