From b60afd91b05e759239ecb08faaf494d5c7445d4e Mon Sep 17 00:00:00 2001
From: alejes <alejes@yandex-team.ru>
Date: Thu, 10 Feb 2022 16:49:20 +0300
Subject: Restoring authorship annotation for <alejes@yandex-team.ru>. Commit 1
of 2.
---
library/cpp/string_utils/quote/quote.cpp | 10 ++++-----
library/cpp/string_utils/quote/quote.h | 2 +-
library/cpp/string_utils/quote/quote_ut.cpp | 32 ++++++++++++++---------------
3 files changed, 22 insertions(+), 22 deletions(-)
(limited to 'library/cpp/string_utils')
diff --git a/library/cpp/string_utils/quote/quote.cpp b/library/cpp/string_utils/quote/quote.cpp
index e523350b80..27cb3a76d0 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 3b7221154e..1d3d86f351 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 6c552b279e..6a889f0a07 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) {
--
cgit v1.2.3