diff options
author | albert <albert@yandex-team.ru> | 2022-02-10 16:48:14 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:48:14 +0300 |
commit | 9f25ef3232c288ca664ceee6c376cf64e4349a2e (patch) | |
tree | b192eaf3150845f7302fafd460a972b0439d6fe5 /library/cpp/cgiparam | |
parent | 6a1e535429145ec1ecfbc5f1efd3c95323261fb5 (diff) | |
download | ydb-9f25ef3232c288ca664ceee6c376cf64e4349a2e.tar.gz |
Restoring authorship annotation for <albert@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/cgiparam')
-rw-r--r-- | library/cpp/cgiparam/cgiparam.cpp | 54 | ||||
-rw-r--r-- | library/cpp/cgiparam/cgiparam.h | 40 | ||||
-rw-r--r-- | library/cpp/cgiparam/cgiparam_ut.cpp | 22 |
3 files changed, 58 insertions, 58 deletions
diff --git a/library/cpp/cgiparam/cgiparam.cpp b/library/cpp/cgiparam/cgiparam.cpp index f3277b8e4b..2170bce69e 100644 --- a/library/cpp/cgiparam/cgiparam.cpp +++ b/library/cpp/cgiparam/cgiparam.cpp @@ -21,13 +21,13 @@ bool TCgiParameters::Erase(const TStringBuf name, size_t pos) { const auto pair = equal_range(name); for (auto it = pair.first; it != pair.second; ++it, --pos) { - if (0 == pos) { - erase(it); - return true; - } + if (0 == pos) { + erase(it); + return true; + } } - return false; + return false; } bool TCgiParameters::Erase(const TStringBuf name, const TStringBuf val) { @@ -47,21 +47,21 @@ bool TCgiParameters::Erase(const TStringBuf name, const TStringBuf val) { } size_t TCgiParameters::EraseAll(const TStringBuf name) { - size_t num = 0; + size_t num = 0; const auto pair = equal_range(name); for (auto it = pair.first; it != pair.second; erase(it++), ++num) - ; - - return num; -} + ; + return num; +} + void TCgiParameters::JoinUnescaped(const TStringBuf key, char sep, TStringBuf val) { const auto pair = equal_range(key); auto it = pair.first; - if (it == pair.second) { // not found + if (it == pair.second) { // not found if (val.IsInited()) { emplace_hint(it, TString(key), TString(val)); } @@ -69,17 +69,17 @@ void TCgiParameters::JoinUnescaped(const TStringBuf key, char sep, TStringBuf va TString& dst = it->second; for (++it; it != pair.second; erase(it++)) { - dst += sep; + dst += sep; dst.AppendNoAlias(it->second.data(), it->second.size()); - } - - if (val.IsInited()) { - dst += sep; - dst += val; - } - } -} - + } + + if (val.IsInited()) { + dst += sep; + dst += val; + } + } +} + static inline TString DoUnescape(const TStringBuf s) { TString res; @@ -155,18 +155,18 @@ char* TCgiParameters::Print(char* res) const { } for (auto i = begin();;) { - res = CGIEscape(res, i->first); + res = CGIEscape(res, i->first); *res++ = '='; - res = CGIEscape(res, i->second); + res = CGIEscape(res, i->second); if (++i == end()) { - break; + break; } *res++ = '&'; } - return res; + return res; } size_t TCgiParameters::PrintSize() const noexcept { @@ -209,11 +209,11 @@ TCgiParameters::const_iterator TCgiParameters::Find(const TStringBuf name, size_ for (auto it = pair.first; it != pair.second; ++it, --pos) { if (0 == pos) { - return it; + return it; } } - return end(); + return end(); } bool TCgiParameters::Has(const TStringBuf name, const TStringBuf value) const noexcept { diff --git a/library/cpp/cgiparam/cgiparam.h b/library/cpp/cgiparam/cgiparam.h index 87d1ab0ad4..6d87d278e7 100644 --- a/library/cpp/cgiparam/cgiparam.h +++ b/library/cpp/cgiparam/cgiparam.h @@ -4,7 +4,7 @@ #include <util/generic/iterator_range.h> #include <util/generic/map.h> -#include <util/generic/strbuf.h> +#include <util/generic/strbuf.h> #include <util/generic/string.h> #include <initializer_list> @@ -17,28 +17,28 @@ struct TStringLess { }; class TCgiParameters: public TMultiMap<TString, TString> { -public: +public: TCgiParameters() = default; explicit TCgiParameters(const TStringBuf cgiParamStr) { Scan(cgiParamStr); - } + } TCgiParameters(std::initializer_list<std::pair<TString, TString>> il); - void Flush() { - erase(begin(), end()); - } + void Flush() { + erase(begin(), end()); + } size_t EraseAll(const TStringBuf name); size_t NumOfValues(const TStringBuf name) const noexcept { - return count(name); - } + return count(name); + } TString operator()() const { - return Print(); - } + return Print(); + } void Scan(const TStringBuf cgiParStr, bool form = true); void ScanAdd(const TStringBuf cgiParStr); @@ -52,7 +52,7 @@ public: * @note Names and values in the returned string are CGI-escaped. */ TString Print() const; - char* Print(char* res) const; + char* Print(char* res) const; Y_PURE_FUNCTION size_t PrintSize() const noexcept; @@ -65,7 +65,7 @@ public: Y_PURE_FUNCTION auto Range(const TStringBuf name) const noexcept { return IterateValues(MakeIteratorRange(equal_range(name))); - } + } Y_PURE_FUNCTION const_iterator Find(const TStringBuf name, size_t numOfValue = 0) const noexcept; @@ -95,7 +95,7 @@ public: // is not implicitly constructible from given type. // But libc++ pair allows this with C++14. emplace(std::forward<TName>(name), std::forward<TValue>(value)); - } + } #else template <typename TName, typename TValue> inline void InsertUnescaped(TName&& name, TValue&& value) { @@ -106,7 +106,7 @@ public: // replace all values for a given key with new values template <typename TIter> void ReplaceUnescaped(const TStringBuf key, TIter valuesBegin, const TIter valuesEnd); - + void ReplaceUnescaped(const TStringBuf key, std::initializer_list<TStringBuf> values) { ReplaceUnescaped(key, values.begin(), values.end()); } @@ -116,21 +116,21 @@ public: } // join multiple values into a single one using a separator - // if val is a [possibly empty] non-NULL string, append it as well + // if val is a [possibly empty] non-NULL string, append it as well void JoinUnescaped(const TStringBuf key, char sep, TStringBuf val = TStringBuf()); - + bool Erase(const TStringBuf name, size_t numOfValue = 0); bool Erase(const TStringBuf name, const TStringBuf val); inline const char* FormField(const TStringBuf name, size_t numOfValue = 0) const { - const_iterator it = Find(name, numOfValue); + const_iterator it = Find(name, numOfValue); - if (it == end()) { + if (it == end()) { return nullptr; } - + return it->second.data(); - } + } }; template <typename TIter> diff --git a/library/cpp/cgiparam/cgiparam_ut.cpp b/library/cpp/cgiparam/cgiparam_ut.cpp index a562342084..603dfd3eda 100644 --- a/library/cpp/cgiparam/cgiparam_ut.cpp +++ b/library/cpp/cgiparam/cgiparam_ut.cpp @@ -60,7 +60,7 @@ Y_UNIT_TEST_SUITE(TCgiParametersTest) { TCgiParameters c; c.ScanAddAll("qw"); - UNIT_ASSERT_VALUES_EQUAL(c.size(), 1u); + UNIT_ASSERT_VALUES_EQUAL(c.size(), 1u); UNIT_ASSERT(c.Get("qw").empty()); } @@ -68,7 +68,7 @@ Y_UNIT_TEST_SUITE(TCgiParametersTest) { TCgiParameters c; c.ScanAddAll("qw&"); - UNIT_ASSERT_VALUES_EQUAL(c.size(), 1u); + UNIT_ASSERT_VALUES_EQUAL(c.size(), 1u); UNIT_ASSERT(c.Get("qw").empty()); } @@ -76,7 +76,7 @@ Y_UNIT_TEST_SUITE(TCgiParametersTest) { TCgiParameters c; c.ScanAddAll("qw=1&x"); - UNIT_ASSERT_VALUES_EQUAL(c.size(), 2u); + UNIT_ASSERT_VALUES_EQUAL(c.size(), 2u); UNIT_ASSERT_VALUES_EQUAL(c.Get("qw"), "1"); UNIT_ASSERT(c.Get("x").empty()); } @@ -182,7 +182,7 @@ Y_UNIT_TEST_SUITE(TCgiParametersTest) { TCgiParameters c; c.ScanAddAll("par=1&aaa=1&par=2&bbb&par=3"); - UNIT_ASSERT_VALUES_EQUAL(c.NumOfValues("par"), 3u); + UNIT_ASSERT_VALUES_EQUAL(c.NumOfValues("par"), 3u); } Y_UNIT_TEST(TestUnscape) { @@ -193,16 +193,16 @@ Y_UNIT_TEST_SUITE(TCgiParametersTest) { Y_UNIT_TEST(TestEmpty) { UNIT_ASSERT(TCgiParameters().Print().empty()); } - + Y_UNIT_TEST(TestJoinUnescaped) { - TCgiParameters c; - + TCgiParameters c; + c.Scan("foo=1&foo=2"); c.JoinUnescaped("foo", ';', "0"); - - UNIT_ASSERT_VALUES_EQUAL(c.Print(), "foo=1;2;0"); - } - + + UNIT_ASSERT_VALUES_EQUAL(c.Print(), "foo=1;2;0"); + } + Y_UNIT_TEST(TestContInit) { TCgiParameters c = {std::make_pair("a", "a1"), std::make_pair("b", "b1"), std::make_pair("a", "a2")}; |