Changeset 101343 in vbox for trunk/src/VBox

Timestamp:

Oct 4, 2023 7:30:37 PM (16 months ago)

Author:

vboxsync

Message:

IPRT/ministring: Added C-style endsWith methods.

Location:

trunk/src/VBox/Runtime

Files:

• common/string/ministring.cpp (modified) (1 diff)
• testcase/tstIprtMiniString.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/string/ministring.cpp

@@ -1038 +1038 @@
 }
 
+bool RTCString::endsWith(const char *a_pszSuffix, size_t a_cchSuffix) const RT_NOEXCEPT
+{
+    Assert(RTStrNLen(a_pszSuffix, a_cchSuffix) == a_cchSuffix);
+    return a_cchSuffix >  0
+        && a_cchSuffix <= length()
+        && ::memcmp(&m_psz[length() - a_cchSuffix], a_pszSuffix, a_cchSuffix) == 0;
+}
+
+bool RTCString::endsWith(const char *a_pszSuffix) const RT_NOEXCEPT
+{
+    return endsWith(a_pszSuffix, strlen(a_pszSuffix));
+}
+
+bool RTCString::endsWithI(const char *a_pszSuffix, size_t a_cchSuffix) const RT_NOEXCEPT
+{
+    Assert(RTStrNLen(a_pszSuffix, a_cchSuffix) == a_cchSuffix);
+    return a_cchSuffix >  0
+        && a_cchSuffix <= length()
+        && ::RTStrNICmp(&m_psz[length() - a_cchSuffix], a_pszSuffix, a_cchSuffix) == 0;
+}
+
+bool RTCString::endsWithI(const char *a_pszSuffix) const RT_NOEXCEPT
+{
+    return endsWithI(a_pszSuffix, strlen(a_pszSuffix));
+}
+
 bool RTCString::startsWith(const RTCString &that, CaseSensitivity cs /*= CaseSensitive*/) const RT_NOEXCEPT
 {

trunk/src/VBox/Runtime/testcase/tstIprtMiniString.cpp

@@ -192 +192 @@
 
     /* printf */
-    RTCString StrFmt;
-    CHECK(StrFmt.printf("%s-%s-%d", "abc", "def", 42).equals("abc-def-42"));
-    test1Hlp1("abc-42-def", "%s-%d-%s", "abc", 42, "def");
-    test1Hlp1("", "");
-    test1Hlp1("1", "1");
-    test1Hlp1("foobar", "%s", "foobar");
+    {
+        RTCString StrFmt;
+        CHECK(StrFmt.printf("%s-%s-%d", "abc", "def", 42).equals("abc-def-42"));
+        test1Hlp1("abc-42-def", "%s-%d-%s", "abc", 42, "def");
+        test1Hlp1("", "");
+        test1Hlp1("1", "1");
+        test1Hlp1("foobar", "%s", "foobar");
+    }
 
     /* substring constructors */
-    RTCString SubStr1("", (size_t)0);
-    CHECK_EQUAL(SubStr1, "");
-
-    RTCString SubStr2("abcdef", 2);
-    CHECK_EQUAL(SubStr2, "ab");
-
-    RTCString SubStr3("abcdef", 1);
-    CHECK_EQUAL(SubStr3, "a");
-
-    RTCString SubStr4("abcdef", 6);
-    CHECK_EQUAL(SubStr4, "abcdef");
-
-    RTCString SubStr5("abcdef", 7);
-    CHECK_EQUAL(SubStr5, "abcdef");
-
-
-    RTCString SubStrBase("abcdef");
-
-    RTCString SubStr10(SubStrBase, 0);
-    CHECK_EQUAL(SubStr10, "abcdef");
-
-    RTCString SubStr11(SubStrBase, 1);
-    CHECK_EQUAL(SubStr11, "bcdef");
-
-    RTCString SubStr12(SubStrBase, 1, 1);
-    CHECK_EQUAL(SubStr12, "b");
-
-    RTCString SubStr13(SubStrBase, 2, 3);
-    CHECK_EQUAL(SubStr13, "cde");
-
-    RTCString SubStr14(SubStrBase, 2, 4);
-    CHECK_EQUAL(SubStr14, "cdef");
-
-    RTCString SubStr15(SubStrBase, 2, 5);
-    CHECK_EQUAL(SubStr15, "cdef");
+    {
+        RTCString SubStr1("", (size_t)0);
+        CHECK_EQUAL(SubStr1, "");
+
+        RTCString SubStr2("abcdef", 2);
+        CHECK_EQUAL(SubStr2, "ab");
+
+        RTCString SubStr3("abcdef", 1);
+        CHECK_EQUAL(SubStr3, "a");
+
+        RTCString SubStr4("abcdef", 6);
+        CHECK_EQUAL(SubStr4, "abcdef");
+
+        RTCString SubStr5("abcdef", 7);
+        CHECK_EQUAL(SubStr5, "abcdef");
+
+        RTCString SubStrBase("abcdef");
+
+        RTCString SubStr10(SubStrBase, 0);
+        CHECK_EQUAL(SubStr10, "abcdef");
+
+        RTCString SubStr11(SubStrBase, 1);
+        CHECK_EQUAL(SubStr11, "bcdef");
+
+        RTCString SubStr12(SubStrBase, 1, 1);
+        CHECK_EQUAL(SubStr12, "b");
+
+        RTCString SubStr13(SubStrBase, 2, 3);
+        CHECK_EQUAL(SubStr13, "cde");
+
+        RTCString SubStr14(SubStrBase, 2, 4);
+        CHECK_EQUAL(SubStr14, "cdef");
+
+        RTCString SubStr15(SubStrBase, 2, 5);
+        CHECK_EQUAL(SubStr15, "cdef");
+    }
 
     /* substr() and substrCP() functions */
@@ -398 +401 @@
     CHECK_EQUAL(StrTruncate2, "");
 
+    /* endsWith */
+    RTCString const strEmpty;
+    strTest = "qwerty";
+    CHECK(strTest.endsWith(strTest));
+    CHECK(strTest.endsWith("qwerty"));
+    CHECK(strTest.endsWith("werty"));
+    CHECK(strTest.endsWith("erty"));
+    CHECK(strTest.endsWith("rty"));
+    CHECK(strTest.endsWith("ty"));
+    CHECK(strTest.endsWith("y"));
+    CHECK(!strTest.endsWith(""));
+    CHECK(strTest.endsWithI("qwerty"));
+    CHECK(strTest.endsWithI("werty"));
+    CHECK(strTest.endsWithI("erty"));
+    CHECK(strTest.endsWithI("rty"));
+    CHECK(strTest.endsWithI("ty"));
+    CHECK(strTest.endsWithI("y"));
+    CHECK(!strTest.endsWithI(""));
+    CHECK(!strTest.endsWith(strEmpty));
+
+    /* startsWith */
+    CHECK(strTest.startsWith(strTest));
+    CHECK(strTest.startsWith("qwerty"));
+    CHECK(strTest.startsWith("qwert"));
+    CHECK(strTest.startsWith("qwer"));
+    CHECK(strTest.startsWith("qwe"));
+    CHECK(strTest.startsWith("qw"));
+    CHECK(strTest.startsWith("q"));
+    CHECK(!strTest.startsWith(""));
+    CHECK(!strTest.startsWith(strEmpty));
+
 #undef CHECK
 #undef CHECK_DUMP