Просмотр исходного кода

Restoring authorship annotation for <rihter007@yandex-team.ru>. Commit 2 of 2.

rihter007 3 лет назад
Родитель
Сommit
149d2fda2c

+ 7 - 7
library/cpp/string_utils/url/url.cpp

@@ -303,13 +303,13 @@ TStringBuf CutWWWNumberedPrefix(const TStringBuf url) noexcept {
     return url;
 }
 
-TStringBuf CutMPrefix(const TStringBuf url) noexcept { 
-    if (url.size() >= 2 && url[1] == '.' && (url[0] == 'm' || url[0] == 'M')) { 
-        return url.substr(2); 
-    } 
-    return url; 
-} 
- 
+TStringBuf CutMPrefix(const TStringBuf url) noexcept {
+    if (url.size() >= 2 && url[1] == '.' && (url[0] == 'm' || url[0] == 'M')) {
+        return url.substr(2);
+    }
+    return url;
+}
+
 static inline bool IsSchemeChar(char c) noexcept {
     return IsAsciiAlnum(c); //what about '+' ?..
 }

+ 12 - 12
library/cpp/string_utils/url/url.h

@@ -145,18 +145,18 @@ TStringBuf CutWWWPrefix(const TStringBuf url) noexcept;
 Y_PURE_FUNCTION
 TStringBuf CutWWWNumberedPrefix(const TStringBuf url) noexcept;
 
-/** 
- * Cuts 'm.' prefix from url if and only if the url starts with it 
- * Example: 'm.some-domain.com' -> 'some-domain.com'. 
- * 'http://m.some-domain.com' is not changed 
- * 
- * @param[in] url   any URL 
- * @return          url without 'm.' or 'M.' prefix. 
- */ 
-Y_PURE_FUNCTION
-TStringBuf CutMPrefix(const TStringBuf url) noexcept; 
- 
-Y_PURE_FUNCTION 
+/**
+ * Cuts 'm.' prefix from url if and only if the url starts with it
+ * Example: 'm.some-domain.com' -> 'some-domain.com'.
+ * 'http://m.some-domain.com' is not changed
+ *
+ * @param[in] url   any URL
+ * @return          url without 'm.' or 'M.' prefix.
+ */
+Y_PURE_FUNCTION
+TStringBuf CutMPrefix(const TStringBuf url) noexcept;
+
+Y_PURE_FUNCTION
 TStringBuf GetDomain(const TStringBuf host) noexcept; // should not be used
 
 size_t NormalizeUrlName(char* dest, const TStringBuf source, size_t dest_size);

+ 5 - 5
library/cpp/string_utils/url/url_ut.cpp

@@ -109,7 +109,7 @@ Y_UNIT_TEST_SUITE(TUtilUrlTest) {
         UNIT_ASSERT_VALUES_EQUAL("", CutWWWPrefix("WwW."));
         UNIT_ASSERT_VALUES_EQUAL("www", CutWWWPrefix("www"));
         UNIT_ASSERT_VALUES_EQUAL("ya.ru", CutWWWPrefix("www.ya.ru"));
- 
+
         UNIT_ASSERT_VALUES_EQUAL("", CutWWWNumberedPrefix("www."));
         UNIT_ASSERT_VALUES_EQUAL("www", CutWWWNumberedPrefix("www"));
         UNIT_ASSERT_VALUES_EQUAL("www27", CutWWWNumberedPrefix("www27"));
@@ -121,10 +121,10 @@ Y_UNIT_TEST_SUITE(TUtilUrlTest) {
         UNIT_ASSERT_VALUES_EQUAL("w1w2w3.ya.ru", CutWWWNumberedPrefix("w1w2w3.ya.ru"));
         UNIT_ASSERT_VALUES_EQUAL("123.ya.ru", CutWWWNumberedPrefix("123.ya.ru"));
 
-        UNIT_ASSERT_VALUES_EQUAL("", CutMPrefix("m.")); 
-        UNIT_ASSERT_VALUES_EQUAL("", CutMPrefix("M.")); 
-        UNIT_ASSERT_VALUES_EQUAL("m", CutMPrefix("m")); 
-        UNIT_ASSERT_VALUES_EQUAL("ya.ru", CutMPrefix("m.ya.ru")); 
+        UNIT_ASSERT_VALUES_EQUAL("", CutMPrefix("m."));
+        UNIT_ASSERT_VALUES_EQUAL("", CutMPrefix("M."));
+        UNIT_ASSERT_VALUES_EQUAL("m", CutMPrefix("m"));
+        UNIT_ASSERT_VALUES_EQUAL("ya.ru", CutMPrefix("m.ya.ru"));
     }
 
     Y_UNIT_TEST(TestSplitUrlToHostAndPath) {