From: Automatic source maintenance Date: Sat, 19 Jun 2010 00:21:59 +0000 (-0600) Subject: SourceFormat Enforcement X-Git-Tag: SQUID_3_2_0_1~125 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7aae06b9f3cdea4be4e337dda0382b7e1cc5ed8;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/errorpage.cc b/src/errorpage.cc index 5c69eba4dc..ac5caf45c8 100644 --- a/src/errorpage.cc +++ b/src/errorpage.cc @@ -723,11 +723,11 @@ ErrorState::Convert(char token, bool url_presentable) break; case 'P': - if (request) { - p = ProtocolStr[request->protocol]; - } else if (!url_presentable) { - p = "[unknown protocol]"; - } + if (request) { + p = ProtocolStr[request->protocol]; + } else if (!url_presentable) { + p = "[unknown protocol]"; + } break; case 'R': @@ -770,8 +770,8 @@ ErrorState::Convert(char token, bool url_presentable) case 'S': if (url_presentable) { p = visible_appname_string; - break; - } + break; + } /* signature may contain %-escapes, recursion */ if (page_id != ERR_SQUID_SIGNATURE) { const int saved_id = page_id; @@ -799,12 +799,12 @@ ErrorState::Convert(char token, bool url_presentable) case 'U': /* Using the fake-https version of canonical so error pages see https:// */ /* even when the url-path cannot be shown as more than '*' */ - if (request) - p = urlCanonicalFakeHttps(request); - else if (url) - p = url; - else if (!url_presentable) - p = "[no URL]"; + if (request) + p = urlCanonicalFakeHttps(request); + else if (url) + p = url; + else if (!url_presentable) + p = "[no URL]"; break; case 'u':