diff options
| author | gorokhov <[email protected]> | 2022-02-10 16:50:58 +0300 | 
|---|---|---|
| committer | Daniil Cherednik <[email protected]> | 2022-02-10 16:50:58 +0300 | 
| commit | e6efe4391d41fbbdefc0c7b36f2f46a1afa51ea4 (patch) | |
| tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 /library/cpp | |
| parent | 5b479cd45d96f09fdae5acb40d9b50b9a58ad374 (diff) | |
Restoring authorship annotation for <[email protected]>. Commit 2 of 2.
Diffstat (limited to 'library/cpp')
| -rw-r--r-- | library/cpp/cgiparam/cgiparam.cpp | 30 | ||||
| -rw-r--r-- | library/cpp/cgiparam/cgiparam.h | 2 | ||||
| -rw-r--r-- | library/cpp/cgiparam/cgiparam_ut.cpp | 20 | 
3 files changed, 26 insertions, 26 deletions
| diff --git a/library/cpp/cgiparam/cgiparam.cpp b/library/cpp/cgiparam/cgiparam.cpp index 17e04680691..f3277b8e4b2 100644 --- a/library/cpp/cgiparam/cgiparam.cpp +++ b/library/cpp/cgiparam/cgiparam.cpp @@ -30,22 +30,22 @@ bool TCgiParameters::Erase(const TStringBuf name, size_t pos) {      return false;  } -bool TCgiParameters::Erase(const TStringBuf name, const TStringBuf val) {  -    const auto pair = equal_range(name);  -  -    bool found = false;  +bool TCgiParameters::Erase(const TStringBuf name, const TStringBuf val) { +    const auto pair = equal_range(name); + +    bool found = false;      for (auto it = pair.first; it != pair.second;) { -        if (val == it->second) {  -            it = erase(it);  -            found = true;  -        } else {  -            ++it;  -        }  -    }  -  -    return found;  -}  -  +        if (val == it->second) { +            it = erase(it); +            found = true; +        } else { +            ++it; +        } +    } + +    return found; +} +  size_t TCgiParameters::EraseAll(const TStringBuf name) {      size_t num = 0; diff --git a/library/cpp/cgiparam/cgiparam.h b/library/cpp/cgiparam/cgiparam.h index fd5be5ba929..87d1ab0ad45 100644 --- a/library/cpp/cgiparam/cgiparam.h +++ b/library/cpp/cgiparam/cgiparam.h @@ -120,7 +120,7 @@ public:      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);  +    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); diff --git a/library/cpp/cgiparam/cgiparam_ut.cpp b/library/cpp/cgiparam/cgiparam_ut.cpp index 89496fa0092..a5623420840 100644 --- a/library/cpp/cgiparam/cgiparam_ut.cpp +++ b/library/cpp/cgiparam/cgiparam_ut.cpp @@ -120,16 +120,16 @@ Y_UNIT_TEST_SUITE(TCgiParametersTest) {      }      Y_UNIT_TEST(TestErase) { -        TCgiParameters c;  -        c.ScanAddAll("par=1&aaa=1&par=2&bbb&par=3&par=1");  -  -        c.Erase("par", 1);  -        UNIT_ASSERT_VALUES_EQUAL(c.Print(), "aaa=1&bbb=&par=1&par=3&par=1");  -  -        c.Erase("par", "1");  -        UNIT_ASSERT_VALUES_EQUAL(c.Print(), "aaa=1&bbb=&par=3");  -    }  -  +        TCgiParameters c; +        c.ScanAddAll("par=1&aaa=1&par=2&bbb&par=3&par=1"); + +        c.Erase("par", 1); +        UNIT_ASSERT_VALUES_EQUAL(c.Print(), "aaa=1&bbb=&par=1&par=3&par=1"); + +        c.Erase("par", "1"); +        UNIT_ASSERT_VALUES_EQUAL(c.Print(), "aaa=1&bbb=&par=3"); +    } +      Y_UNIT_TEST(TestReplaceUnescaped1) {          TCgiParameters c;          c.ScanAddAll("many_keys=1&aaa=1&many_keys=2&bbb&many_keys=3"); | 
