diff options
author | alejes <alejes@yandex-team.ru> | 2022-02-10 16:49:21 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:49:21 +0300 |
commit | 296addf192418e73b12dd8c5110ac1a36d9dee19 (patch) | |
tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 /library/cpp/string_utils | |
parent | b60afd91b05e759239ecb08faaf494d5c7445d4e (diff) | |
download | ydb-296addf192418e73b12dd8c5110ac1a36d9dee19.tar.gz |
Restoring authorship annotation for <alejes@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/string_utils')
-rw-r--r-- | library/cpp/string_utils/quote/quote.cpp | 10 | ||||
-rw-r--r-- | library/cpp/string_utils/quote/quote.h | 2 | ||||
-rw-r--r-- | library/cpp/string_utils/quote/quote_ut.cpp | 32 |
3 files changed, 22 insertions, 22 deletions
diff --git a/library/cpp/string_utils/quote/quote.cpp b/library/cpp/string_utils/quote/quote.cpp index 27cb3a76d0..e523350b80 100644 --- a/library/cpp/string_utils/quote/quote.cpp +++ b/library/cpp/string_utils/quote/quote.cpp @@ -302,10 +302,10 @@ void UrlEscape(TString& url, bool forceEscape) { char* to = tempBuf.Data(); url.AssignNoAlias(to, UrlEscape(to, url.data(), forceEscape)); } - -TString UrlEscapeRet(const TStringBuf from, bool forceEscape) { - TString to; + +TString UrlEscapeRet(const TStringBuf from, bool forceEscape) { + TString to; to.ReserveAndResize(CgiEscapeBufLen(from.size())); to.resize(UrlEscape(to.begin(), from.begin(), forceEscape) - to.data()); - return to; -} + return to; +} diff --git a/library/cpp/string_utils/quote/quote.h b/library/cpp/string_utils/quote/quote.h index 1d3d86f351..3b7221154e 100644 --- a/library/cpp/string_utils/quote/quote.h +++ b/library/cpp/string_utils/quote/quote.h @@ -53,7 +53,7 @@ void Quote(TString& url, const char* safe = "/"); // Can't handle '\0'-chars in TString. char* UrlEscape(char* to, const char* from, bool forceEscape = false); void UrlEscape(TString& url, bool forceEscape = false); -TString UrlEscapeRet(const TStringBuf from, bool forceEscape = false); +TString UrlEscapeRet(const TStringBuf from, bool forceEscape = false); //UrlUnescape: // '+' is NOT converted to space! diff --git a/library/cpp/string_utils/quote/quote_ut.cpp b/library/cpp/string_utils/quote/quote_ut.cpp index 6a889f0a07..6c552b279e 100644 --- a/library/cpp/string_utils/quote/quote_ut.cpp +++ b/library/cpp/string_utils/quote/quote_ut.cpp @@ -183,7 +183,7 @@ Y_UNIT_TEST_SUITE(TUrlEscapeTest) { TString s; s = "hello%3dworld"; - UNIT_ASSERT_VALUES_EQUAL(UrlEscapeRet(s), "hello%3dworld"); + UNIT_ASSERT_VALUES_EQUAL(UrlEscapeRet(s), "hello%3dworld"); UrlEscape(s); UNIT_ASSERT_VALUES_EQUAL(s, "hello%3dworld"); } @@ -197,18 +197,18 @@ Y_UNIT_TEST_SUITE(TUrlEscapeTest) { UNIT_ASSERT_VALUES_EQUAL(s, "hello=world"); } - Y_UNIT_TEST(EscapeUnescapeRet) { - TString s; - - s = "hello%3dworld"; - UNIT_ASSERT_VALUES_EQUAL(UrlUnescapeRet(UrlEscapeRet(s)), "hello=world"); - } - + Y_UNIT_TEST(EscapeUnescapeRet) { + TString s; + + s = "hello%3dworld"; + UNIT_ASSERT_VALUES_EQUAL(UrlUnescapeRet(UrlEscapeRet(s)), "hello=world"); + } + Y_UNIT_TEST(EscapeEscapedForce) { TString s; s = "hello%3dworld"; - UNIT_ASSERT_VALUES_EQUAL(UrlEscapeRet(s, true), "hello%253dworld"); + UNIT_ASSERT_VALUES_EQUAL(UrlEscapeRet(s, true), "hello%253dworld"); UrlEscape(s, true); UNIT_ASSERT_VALUES_EQUAL(s, "hello%253dworld"); } @@ -221,13 +221,13 @@ Y_UNIT_TEST_SUITE(TUrlEscapeTest) { UrlUnescape(s); UNIT_ASSERT_VALUES_EQUAL(s, "hello%3dworld"); } - - Y_UNIT_TEST(EscapeUnescapeForceRet) { - TString s; - - s = "hello%3dworld"; - UNIT_ASSERT_VALUES_EQUAL(UrlUnescapeRet(UrlEscapeRet(s, true)), "hello%3dworld"); - } + + Y_UNIT_TEST(EscapeUnescapeForceRet) { + TString s; + + s = "hello%3dworld"; + UNIT_ASSERT_VALUES_EQUAL(UrlUnescapeRet(UrlEscapeRet(s, true)), "hello%3dworld"); + } } Y_UNIT_TEST_SUITE(TUrlUnescapeTest) { |