From: Automatic source maintenance Date: Thu, 5 Nov 2009 01:12:55 +0000 (-0700) Subject: SourceFormat Enforcement X-Git-Tag: SQUID_3_2_0_1~615 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79c8a298d11594b03e17a66c5a553c0213546111;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/lib/rfc1738.c b/lib/rfc1738.c index 59781156e0..a769e60eb6 100644 --- a/lib/rfc1738.c +++ b/lib/rfc1738.c @@ -177,7 +177,7 @@ rfc1738_escape_part(const char *url) * rfc1738_unescape() - Converts escaped characters (%xy numbers) in * given the string. %% is a %. %ab is the 8-bit hexadecimal number "ab" */ -static inline int +static inline int fromhex(char ch) { if (ch >= '0' && ch <= '9') @@ -203,13 +203,13 @@ rfc1738_unescape(char *s) /* decode */ char v1, v2; v1 = fromhex(s[j + 1]); - if (v1 < 0) - continue; /* non-hex or \0 */ + if (v1 < 0) + continue; /* non-hex or \0 */ v2 = fromhex(s[j + 2]); - if (v2 < 0) - continue; /* non-hex or \0 */ - s[i] = v1 << 4 | v2; - j += 2; + if (v2 < 0) + continue; /* non-hex or \0 */ + s[i] = v1 << 4 | v2; + j += 2; } } s[i] = '\0'; diff --git a/src/acl/DestinationDomain.cc b/src/acl/DestinationDomain.cc index 30d2af8847..5d765343d1 100644 --- a/src/acl/DestinationDomain.cc +++ b/src/acl/DestinationDomain.cc @@ -81,7 +81,7 @@ ACLDestinationDomainStrategy::match (ACLData * &data, ACLFilledCheckl } /* numeric IPA? no, trust the above result. */ - if(checklist->request->GetHostIsNumeric() == 0) { + if (checklist->request->GetHostIsNumeric() == 0) { return 0; }