儲存庫 vbox 的更動 67650

時間撮記:

2017-6-27 下午04:55:17 (7 年 以前)

作者:

vboxsync

訊息:

IPRT: Added const char * variant of RTCString::contains.

位置:

trunk

檔案:

• include/iprt/cpp/ministring.h (修改) (12 筆差異)
• src/VBox/Runtime/common/string/ministring.cpp (修改) (1 筆差異)

trunk/include/iprt/cpp/ministring.h

@@ -290 +290 @@
 
     /**
-     * Assigns a copy of pcsz to "this".
+     * Assigns a copy of pcsz to @a this.
      *
      * @param   pcsz            The source string.
@@ -310 +310 @@
 
     /**
-     * Assigns a copy of s to "this".
+     * Assigns a copy of s to @a this.
      *
      * @param   s               The source string.
@@ -358 +358 @@
 
     /**
-     * Appends the string "that" to "this".
+     * Appends the string @a that to @a this.
      *
      * @param   that            The string to append.
@@ -369 +369 @@
 
     /**
-     * Appends the string "that" to "this".
+     * Appends the string @a that to @a this.
      *
      * @param   pszThat         The C string to append.
@@ -380 +380 @@
 
     /**
-     * Appends the given character to "this".
+     * Appends the given character to @a this.
      *
      * @param   ch              The character to append.
@@ -391 +391 @@
 
     /**
-     * Appends the given unicode code point to "this".
+     * Appends the given unicode code point to @a this.
      *
      * @param   uc              The unicode code point to append.
@@ -759 +759 @@
 
     /**
-     * Returns a substring of "this" as a new Utf8Str.
+     * Returns a substring of @a this as a new Utf8Str.
      *
      * Works exactly like its equivalent in std::string. With the default
@@ -767 +767 @@
      * used in conjunction with find() and length(), this will work.
      *
-     * @param   pos             Index of first byte offset to copy from "this", counting from 0.
+     * @param   pos             Index of first byte offset to copy from @a this,
+     *                          counting from 0.
      * @param   n               Number of bytes to copy, starting with the one at "pos".
      *                          The copying will stop if the null terminator is encountered before
@@ -778 +779 @@
 
     /**
-     * Returns a substring of "this" as a new Utf8Str. As opposed to substr(),
-     * this variant takes codepoint offsets instead of byte offsets.
+     * Returns a substring of @a this as a new Utf8Str. As opposed to substr(), this
+     * variant takes codepoint offsets instead of byte offsets.
      *
      * @param   pos             Index of first unicode codepoint to copy from
-     *                          "this", counting from 0.
+     *                          @a this, counting from 0.
      * @param   n               Number of unicode codepoints to copy, starting with
      *                          the one at "pos".  The copying will stop if the null
@@ -791 +792 @@
 
     /**
-     * Returns true if "this" ends with "that".
+     * Returns true if @a this ends with @a that.
      *
      * @param   that    Suffix to test for.
@@ -800 +801 @@
 
     /**
-     * Returns true if "this" begins with "that".
+     * Returns true if @a this begins with @a that.
      * @param   that    Prefix to test for.
      * @param   cs      Case sensitivity selector.
@@ -808 +809 @@
 
     /**
-     * Returns true if "this" contains "that" (strstr).
+     * Returns true if @a this contains @a that (strstr).
      *
      * @param   that    Substring to look for.
      * @param   cs      Case sensitivity selector.
-     * @returns true if match, false if mismatch.
+     * @returns true if found, false if not found.
      */
     bool contains(const RTCString &that, CaseSensitivity cs = CaseSensitive) const;
+
+    /**
+     * Returns true if @a this contains @a pszNeedle (strstr).
+     *
+     * @param   pszNeedle   Substring to look for.
+     * @param   cs          Case sensitivity selector.
+     * @returns true if found, false if not found.
+     */
+    bool contains(const char *pszNeedle, CaseSensitivity cs = CaseSensitive) const;
 
     /**

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

@@ -372 +372 @@
 }
 
+bool RTCString::contains(const char *pszNeedle, CaseSensitivity cs /*= CaseSensitive*/) const
+{
+    /** @todo r-bird: Not checking for NULL strings like startsWith does (and
+     *        endsWith only does half way). */
+    if (cs == CaseSensitive)
+        return ::RTStrStr(m_psz, pszNeedle) != NULL;
+    return ::RTStrIStr(m_psz, pszNeedle) != NULL;
+}
+
 int RTCString::toInt(uint64_t &i) const
 {