diff options
author | denplusplus <denplusplus@yandex-team.ru> | 2022-02-10 16:47:34 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:34 +0300 |
commit | 57c20d143e8a438cd76b9fdc3ca2e8ee3ac1f32a (patch) | |
tree | cc63639f8e502db19a82c20e2861c6d1edbf9fea /library/cpp/string_utils | |
parent | 464ba3814a83db4f2d5327393b0b6eaf0c86bfd7 (diff) | |
download | ydb-57c20d143e8a438cd76b9fdc3ca2e8ee3ac1f32a.tar.gz |
Restoring authorship annotation for <denplusplus@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/string_utils')
-rw-r--r-- | library/cpp/string_utils/url/url.cpp | 22 | ||||
-rw-r--r-- | library/cpp/string_utils/url/url.h | 2 | ||||
-rw-r--r-- | library/cpp/string_utils/url/url_ut.cpp | 28 |
3 files changed, 26 insertions, 26 deletions
diff --git a/library/cpp/string_utils/url/url.cpp b/library/cpp/string_utils/url/url.cpp index 85f4ac5d69..1a7a0f6ed7 100644 --- a/library/cpp/string_utils/url/url.cpp +++ b/library/cpp/string_utils/url/url.cpp @@ -51,7 +51,7 @@ namespace { if (!ignorehttps && urlSize.Has(8) && Compare1Case2(url, httpsPrefix, 8) == 0) return 8; return 0; - } + } template <typename T> inline T CutHttpPrefixImpl(const T& url, bool ignorehttps) { @@ -255,14 +255,14 @@ TStringBuf GetDomain(const TStringBuf host) noexcept { if (*c == '.') { if (wasPoint) { ++c; - break; + break; } - wasPoint = true; - } - } + wasPoint = true; + } + } return TStringBuf(c, host.end()); -} - +} + TStringBuf GetParentDomain(const TStringBuf host, size_t level) noexcept { size_t pos = host.size(); for (size_t i = 0; i < level; ++i) { @@ -275,8 +275,8 @@ TStringBuf GetParentDomain(const TStringBuf host, size_t level) noexcept { TStringBuf GetZone(const TStringBuf host) noexcept { return GetParentDomain(host, 1); -} - +} + TStringBuf CutWWWPrefix(const TStringBuf url) noexcept { if (url.size() >= 4 && url[3] == '.' && !strnicmp(url.data(), "www", 3)) return url.substr(4); @@ -342,8 +342,8 @@ static inline int x2c(unsigned char* x) { return X(x[0]) * 16 + X(x[1]); } -#undef X - +#undef X + static inline int Unescape(char* str) { char *to, *from; int dlen = 0; diff --git a/library/cpp/string_utils/url/url.h b/library/cpp/string_utils/url/url.h index 84137ccc57..a4d6b9a400 100644 --- a/library/cpp/string_utils/url/url.h +++ b/library/cpp/string_utils/url/url.h @@ -2,7 +2,7 @@ #include <util/generic/fwd.h> #include <util/generic/strbuf.h> - + namespace NUrl { /** diff --git a/library/cpp/string_utils/url/url_ut.cpp b/library/cpp/string_utils/url/url_ut.cpp index 1588013893..80085b31e3 100644 --- a/library/cpp/string_utils/url/url_ut.cpp +++ b/library/cpp/string_utils/url/url_ut.cpp @@ -26,7 +26,7 @@ Y_UNIT_TEST_SUITE(TUtilUrlTest) { UNIT_ASSERT_VALUES_EQUAL("some_blender_url", GetHost("some_blender_url")); UNIT_ASSERT_VALUES_EQUAL("", GetHost("")); } - + Y_UNIT_TEST(TestGetPathAndQuery) { UNIT_ASSERT_VALUES_EQUAL("/", GetPathAndQuery("ru.wikipedia.org")); UNIT_ASSERT_VALUES_EQUAL("/", GetPathAndQuery("ru.wikipedia.org/")); @@ -40,14 +40,14 @@ Y_UNIT_TEST_SUITE(TUtilUrlTest) { } Y_UNIT_TEST(TestGetDomain) { - UNIT_ASSERT_VALUES_EQUAL("ya.ru", GetDomain("www.ya.ru")); - UNIT_ASSERT_VALUES_EQUAL("ya.ru", GetDomain("ya.ru")); - UNIT_ASSERT_VALUES_EQUAL("ya.ru", GetDomain("a.b.ya.ru")); - UNIT_ASSERT_VALUES_EQUAL("ya.ru", GetDomain("ya.ru")); - UNIT_ASSERT_VALUES_EQUAL("ya", GetDomain("ya")); + UNIT_ASSERT_VALUES_EQUAL("ya.ru", GetDomain("www.ya.ru")); + UNIT_ASSERT_VALUES_EQUAL("ya.ru", GetDomain("ya.ru")); + UNIT_ASSERT_VALUES_EQUAL("ya.ru", GetDomain("a.b.ya.ru")); + UNIT_ASSERT_VALUES_EQUAL("ya.ru", GetDomain("ya.ru")); + UNIT_ASSERT_VALUES_EQUAL("ya", GetDomain("ya")); UNIT_ASSERT_VALUES_EQUAL("", GetDomain("")); - } - + } + Y_UNIT_TEST(TestGetParentDomain) { UNIT_ASSERT_VALUES_EQUAL("", GetParentDomain("www.ya.ru", 0)); UNIT_ASSERT_VALUES_EQUAL("ru", GetParentDomain("www.ya.ru", 1)); @@ -63,12 +63,12 @@ Y_UNIT_TEST_SUITE(TUtilUrlTest) { } Y_UNIT_TEST(TestGetZone) { - UNIT_ASSERT_VALUES_EQUAL("ru", GetZone("www.ya.ru")); - UNIT_ASSERT_VALUES_EQUAL("com", GetZone("ya.com")); - UNIT_ASSERT_VALUES_EQUAL("RU", GetZone("RU")); - UNIT_ASSERT_VALUES_EQUAL("FHFBN", GetZone("ya.FHFBN")); - UNIT_ASSERT_VALUES_EQUAL("", GetZone("")); - } + UNIT_ASSERT_VALUES_EQUAL("ru", GetZone("www.ya.ru")); + UNIT_ASSERT_VALUES_EQUAL("com", GetZone("ya.com")); + UNIT_ASSERT_VALUES_EQUAL("RU", GetZone("RU")); + UNIT_ASSERT_VALUES_EQUAL("FHFBN", GetZone("ya.FHFBN")); + UNIT_ASSERT_VALUES_EQUAL("", GetZone("")); + } Y_UNIT_TEST(TestAddSchemePrefix) { UNIT_ASSERT_VALUES_EQUAL("http://yandex.ru", AddSchemePrefix("yandex.ru")); |