TS-2316: header_rewrite: removed trailing spaces Submitted by: Alexey Ivanov <[email protected]> Sponsored by: LinkedIn
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/38b05cd4 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/38b05cd4 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/38b05cd4 Branch: refs/heads/master Commit: 38b05cd4e9b96ba920f9f61a988e037251853c25 Parents: f1ea0d7 Author: Alexey Ivanov <[email protected]> Authored: Sat Nov 2 19:34:13 2013 -0700 Committer: Alexey Ivanov <[email protected]> Committed: Sun Nov 10 18:07:53 2013 -0800 ---------------------------------------------------------------------- plugins/header_rewrite/README | 8 ++++---- plugins/header_rewrite/condition.h | 2 +- plugins/header_rewrite/conditions.cc | 2 +- plugins/header_rewrite/conditions.h | 6 +++--- plugins/header_rewrite/factory.h | 2 +- plugins/header_rewrite/lulu.h | 2 +- plugins/header_rewrite/matcher.h | 8 ++++---- plugins/header_rewrite/operators.cc | 10 +++++----- plugins/header_rewrite/operators.h | 2 +- plugins/header_rewrite/parser.h | 2 +- plugins/header_rewrite/regex_helper.cc | 10 +++++----- plugins/header_rewrite/regex_helper.h | 4 ++-- plugins/header_rewrite/resources.cc | 4 ++-- plugins/header_rewrite/resources.h | 2 +- plugins/header_rewrite/ruleset.h | 2 +- plugins/header_rewrite/statement.h | 2 +- plugins/header_rewrite/value.h | 2 +- 17 files changed, 35 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/38b05cd4/plugins/header_rewrite/README ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/README b/plugins/header_rewrite/README index 6b5f535..f90d62a 100644 --- a/plugins/header_rewrite/README +++ b/plugins/header_rewrite/README @@ -28,7 +28,7 @@ during the origin response header parsing, using READ_RESPONSE_HDR_HOOK. Operators --------- -The following operators are available: +The following operators are available: rm-header header-name [flags] add-header header <value> [flags] @@ -164,13 +164,13 @@ Version 1.6.9 (10,17,11,cdoshi) - Support for PATH condition Version 1.6.8 (10/17/11,cdoshi) - - Replace the INKHttpHdrStatusSet with INKHttptxnSetHttpRetStatus + - Replace the INKHttpHdrStatusSet with INKHttptxnSetHttpRetStatus Version 1.6.7 (07/21/11, bcall) - [bug 4699620] - Removed some extra printf()'s Version 1.6.6 (cdoshi) - - when Host adder is added setHostChange will be called + - when Host adder is added setHostChange will be called Version 1.6.5 (cdoshi) - fix QSA for set-destination @@ -185,7 +185,7 @@ Version 1.6.2 (cdoshi) - Support for regex matcher Version 1.6.1 (09/15/10, leif) - - [bug 3985913] + - [bug 3985913] Version 1.6.0 (07/14/10, leif) - Added support for the timeout-out operator. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/38b05cd4/plugins/header_rewrite/condition.h ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/condition.h b/plugins/header_rewrite/condition.h index e832a87..a33786c 100644 --- a/plugins/header_rewrite/condition.h +++ b/plugins/header_rewrite/condition.h @@ -16,7 +16,7 @@ limitations under the License. */ ////////////////////////////////////////////////////////////////////////////////////////////// -// +// // Implement the classes for the various types of hash keys we support. // #ifndef __CONDITION_H__ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/38b05cd4/plugins/header_rewrite/conditions.cc ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/conditions.cc b/plugins/header_rewrite/conditions.cc index 173f94e..40f92ef 100644 --- a/plugins/header_rewrite/conditions.cc +++ b/plugins/header_rewrite/conditions.cc @@ -226,7 +226,7 @@ ConditionPath::initialize(Parser& p) void ConditionPath::append_value(std::string& s, const Resources& res) -{ +{ int path_len = 0; const char *path = TSUrlPathGet(res._rri->requestBufp, res._rri->requestUrl, &path_len); TSDebug(PLUGIN_NAME, "Appending PATH to evaluation value: %.*s", path_len, path); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/38b05cd4/plugins/header_rewrite/conditions.h ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/conditions.h b/plugins/header_rewrite/conditions.h index 1123100..96d1db4 100644 --- a/plugins/header_rewrite/conditions.h +++ b/plugins/header_rewrite/conditions.h @@ -16,7 +16,7 @@ limitations under the License. */ ////////////////////////////////////////////////////////////////////////////////////////////// -// +// // Declarations for all conditionals / conditional values we support. // #ifndef __CONDITIONS_H__ @@ -168,7 +168,7 @@ private: bool _client; }; -// path +// path class ConditionPath : public Condition { public: @@ -239,7 +239,7 @@ class ConditionDBM : public Condition { public: ConditionDBM() - : + : //_dbm(NULL), _file("") { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/38b05cd4/plugins/header_rewrite/factory.h ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/factory.h b/plugins/header_rewrite/factory.h index d10280a..e229449 100644 --- a/plugins/header_rewrite/factory.h +++ b/plugins/header_rewrite/factory.h @@ -16,7 +16,7 @@ limitations under the License. */ ////////////////////////////////////////////////////////////////////////////////////////////// -// +// // Implement the classes for the various types of hash keys we support. // #ifndef __FACTORY_H__ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/38b05cd4/plugins/header_rewrite/lulu.h ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/lulu.h b/plugins/header_rewrite/lulu.h index 99876ec..0dd3cb1 100644 --- a/plugins/header_rewrite/lulu.h +++ b/plugins/header_rewrite/lulu.h @@ -16,7 +16,7 @@ limitations under the License. */ ////////////////////////////////////////////////////////////////////////////////////////////// -// +// // Implement the classes for the various types of hash keys we support. // #ifndef __LULU_H__ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/38b05cd4/plugins/header_rewrite/matcher.h ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/matcher.h b/plugins/header_rewrite/matcher.h index 833bb84..29906a9 100644 --- a/plugins/header_rewrite/matcher.h +++ b/plugins/header_rewrite/matcher.h @@ -16,7 +16,7 @@ limitations under the License. */ ////////////////////////////////////////////////////////////////////////////////////////////// -// +// // Implement the classes for the various types of hash keys we support. // #ifndef __MATCHER_H__ @@ -80,7 +80,7 @@ public: // Getters / setters const T get() const { return _data; }; - + void setRegex(const std::string /* data ATS_UNUSED */) { if (!helper.setRegexMatch(_data)) { @@ -94,7 +94,7 @@ public: void setRegex(const TSHttpStatus /* t ATS_UNUSED */) { return; } void set (const T d) - { + { _data = d; if(_op == MATCH_REGULAR_EXPRESSION) setRegex(d); @@ -152,7 +152,7 @@ private: // Not supported return false; } - + bool test_reg(const std::string t) const { TSDebug(PLUGIN_NAME, "Test regular expression %s : %s", _data.c_str(), t.c_str()); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/38b05cd4/plugins/header_rewrite/operators.cc ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/operators.cc b/plugins/header_rewrite/operators.cc index 3913dd9..69c6bec 100644 --- a/plugins/header_rewrite/operators.cc +++ b/plugins/header_rewrite/operators.cc @@ -258,10 +258,10 @@ OperatorSetRedirect::exec(const Resources& res) const std::string value; _location.append_value(value, res); - + // Replace %{PATH} to original path size_t pos_path = 0; - + if ((pos_path = value.find("%{PATH}")) != std::string::npos) { value.erase(pos_path, 7); // erase %{PATH} from the rewritten to url int path_len = 0; @@ -271,7 +271,7 @@ OperatorSetRedirect::exec(const Resources& res) const value.insert(pos_path, path, path_len); } } - + // Append the original query string int query_len = 0; const char *query = TSUrlHttpQueryGet(res._rri->requestBufp, res._rri->requestUrl, &query_len); @@ -287,10 +287,10 @@ OperatorSetRedirect::exec(const Resources& res) const const char *start = value.c_str(); const char *end = value.size() + start; TSUrlParse(res._rri->requestBufp, res._rri->requestUrl, &start, end); - TSDebug(PLUGIN_NAME, "OperatorSetRedirect::exec() invoked with destination=%s and status code=%d", + TSDebug(PLUGIN_NAME, "OperatorSetRedirect::exec() invoked with destination=%s and status code=%d", value.c_str(), _status.get_int_value()); } - + } else { // TODO: Handle the non-remap case here (InkAPI hooks) } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/38b05cd4/plugins/header_rewrite/operators.h ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/operators.h b/plugins/header_rewrite/operators.h index 925b23e..65bbcb4 100644 --- a/plugins/header_rewrite/operators.h +++ b/plugins/header_rewrite/operators.h @@ -16,7 +16,7 @@ limitations under the License. */ ////////////////////////////////////////////////////////////////////////////////////////////// -// +// // Implement the classes for the various types of hash keys we support. // #ifndef __OPERATORS_H__ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/38b05cd4/plugins/header_rewrite/parser.h ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/parser.h b/plugins/header_rewrite/parser.h index 0417fff..65ff38a 100644 --- a/plugins/header_rewrite/parser.h +++ b/plugins/header_rewrite/parser.h @@ -16,7 +16,7 @@ limitations under the License. */ ////////////////////////////////////////////////////////////////////////////////////////////// -// +// // Interface for the config line parser // #ifndef __PARSER_H__ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/38b05cd4/plugins/header_rewrite/regex_helper.cc ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/regex_helper.cc b/plugins/header_rewrite/regex_helper.cc index 4bfdb23..bf3eaca 100644 --- a/plugins/header_rewrite/regex_helper.cc +++ b/plugins/header_rewrite/regex_helper.cc @@ -18,7 +18,7 @@ #include "regex_helper.h" bool -regexHelper::setRegexMatch(const std::string& s) +regexHelper::setRegexMatch(const std::string& s) { const char* errorComp = NULL; @@ -28,12 +28,12 @@ regexHelper::setRegexMatch(const std::string& s) regexString = s; regex = pcre_compile(regexString.c_str(), 0, &errorComp, &erroffset, NULL); - if (regex == NULL) + if (regex == NULL) { return false; } regexExtra = pcre_study(regex, 0, &errorStudy); - if ((regexExtra == NULL) && (errorStudy != 0)) + if ((regexExtra == NULL) && (errorStudy != 0)) { return false; } @@ -43,13 +43,13 @@ regexHelper::setRegexMatch(const std::string& s) } const std::string& -regexHelper::getRegexString() const +regexHelper::getRegexString() const { return regexString; } int -regexHelper::getRegexCcount() const +regexHelper::getRegexCcount() const { return regexCcount; } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/38b05cd4/plugins/header_rewrite/regex_helper.h ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/regex_helper.h b/plugins/header_rewrite/regex_helper.h index 5edbb10..7d24da4 100644 --- a/plugins/header_rewrite/regex_helper.h +++ b/plugins/header_rewrite/regex_helper.h @@ -31,10 +31,10 @@ public: regexHelper(): regex(NULL),regexExtra(NULL),regexCcount(0) { - + } - ~regexHelper() + ~regexHelper() { if (regex) pcre_free(regex); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/38b05cd4/plugins/header_rewrite/resources.cc ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/resources.cc b/plugins/header_rewrite/resources.cc index c33dfbf..d89149a 100644 --- a/plugins/header_rewrite/resources.cc +++ b/plugins/header_rewrite/resources.cc @@ -97,8 +97,8 @@ Resources::gather(const ResourceIDs ids, TSHttpHookID hook) hdr_loc = client_hdr_loc; } break; - - + + default: break; } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/38b05cd4/plugins/header_rewrite/resources.h ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/resources.h b/plugins/header_rewrite/resources.h index d63b4e7..cb9d062 100644 --- a/plugins/header_rewrite/resources.h +++ b/plugins/header_rewrite/resources.h @@ -16,7 +16,7 @@ limitations under the License. */ ////////////////////////////////////////////////////////////////////////////////////////////// -// +// // Implement the classes for the various types of hash keys we support. // #ifndef __RESOURCES_H__ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/38b05cd4/plugins/header_rewrite/ruleset.h ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/ruleset.h b/plugins/header_rewrite/ruleset.h index d106ef4..5197a9d 100644 --- a/plugins/header_rewrite/ruleset.h +++ b/plugins/header_rewrite/ruleset.h @@ -16,7 +16,7 @@ limitations under the License. */ ////////////////////////////////////////////////////////////////////////////////////////////// -// +// // Implement the classes for the various types of hash keys we support. // #ifndef __RULESET_H__ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/38b05cd4/plugins/header_rewrite/statement.h ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/statement.h b/plugins/header_rewrite/statement.h index 15fdf11..0db1eb2 100644 --- a/plugins/header_rewrite/statement.h +++ b/plugins/header_rewrite/statement.h @@ -16,7 +16,7 @@ limitations under the License. */ ////////////////////////////////////////////////////////////////////////////////////////////// -// +// // Base class for all Conditions and Operations. We share the "linked" list, and the // resource management / requirements. // http://git-wip-us.apache.org/repos/asf/trafficserver/blob/38b05cd4/plugins/header_rewrite/value.h ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/value.h b/plugins/header_rewrite/value.h index ef8c401..cbdd7f8 100644 --- a/plugins/header_rewrite/value.h +++ b/plugins/header_rewrite/value.h @@ -17,7 +17,7 @@ */ ////////////////////////////////////////////////////////////////////////////////////////////// // Public interface for creating all values. -// +// // #ifndef __VALUE_H__ #define __VALUE_H__ 1
