Changeset 73908 in vbox for trunk/src/VBox/Runtime/common/string/ministring.cpp

Timestamp:

Aug 27, 2018 10:15:30 AM (6 years ago)

Author:

vboxsync

Message:

iprt/cpp/ministring.h: Added appendPrintf with all variants. Marked a lot of methods with noexcept.

File:

• trunk/src/VBox/Runtime/common/string/ministring.cpp (modified) (19 diffs)

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

@@ -283 +283 @@
 }
 
+RTCString &RTCString::appendPrintfV(const char *pszFormat, va_list va)
+{
+    RTStrFormatV(printfOutputCallback, this, NULL, NULL, pszFormat, va);
+    return *this;
+}
+
 struct RTCSTRINGOTHROW
 {
@@ -338 +344 @@
 }
 
+int RTCString::appendPrintfVNoThrow(const char *pszFormat, va_list va) RT_NOEXCEPT
+{
+    RTCSTRINGOTHROW Args = { this, VINF_SUCCESS };
+    RTStrFormatV(printfOutputCallback, &Args, NULL, NULL, pszFormat, va);
+    return Args.rc;
+}
+
+RTCString &RTCString::appendPrintf(const char *pszFormat, ...)
+{
+    va_list va;
+    va_start(va, pszFormat);
+    appendPrintfV(pszFormat, va);
+    va_end(va);
+    return *this;
+}
+
+int RTCString::appendPrintfNoThrow(const char *pszFormat, ...) RT_NOEXCEPT
+{
+    va_list va;
+    va_start(va, pszFormat);
+    int rc = appendPrintfVNoThrow(pszFormat, va);
+    va_end(va);
+    return rc;
+}
+
 RTCString &RTCString::append(const RTCString &that)
 {
@@ -538 +569 @@
 }
 
-
-RTCString &RTCString::erase(size_t offStart /*= 0*/, size_t cchLength /*= npos*/)
+RTCString &RTCString::erase(size_t offStart /*= 0*/, size_t cchLength /*= npos*/) RT_NOEXCEPT
 {
     size_t cch = length();
@@ -592 +622 @@
 
 int RTCString::replaceNoThrow(size_t offStart, size_t cchLength, const RTCString &rStrReplacement,
-                              size_t offReplacement, size_t cchReplacement)
+                              size_t offReplacement, size_t cchReplacement) RT_NOEXCEPT
 {
     Assert(this != &rStrReplacement);
@@ -713 +743 @@
 
 
-size_t RTCString::find(const char *pszNeedle, size_t offStart /*= 0*/) const
+size_t RTCString::find(const char *pszNeedle, size_t offStart /*= 0*/) const RT_NOEXCEPT
 {
     if (offStart < length())
@@ -732 +762 @@
 }
 
-size_t RTCString::find(const RTCString *pStrNeedle, size_t offStart /*= 0*/) const
+size_t RTCString::find(const RTCString *pStrNeedle, size_t offStart /*= 0*/) const RT_NOEXCEPT
 {
     if (offStart < length())
@@ -755 +785 @@
 }
 
-void RTCString::findReplace(char chFind, char chReplace)
+void RTCString::findReplace(char chFind, char chReplace) RT_NOEXCEPT
 {
     Assert((unsigned int)chFind    < 128U);
@@ -768 +798 @@
 }
 
-size_t RTCString::count(char ch) const
+size_t RTCString::count(char ch) const RT_NOEXCEPT
 {
     Assert((unsigned int)ch < 128U);
@@ -785 +815 @@
 
 #if 0  /** @todo implement these when needed. */
-size_t RTCString::count(const char *psz, CaseSensitivity cs = CaseSensitive) const
-{
-}
-
-size_t RTCString::count(const RTCString *pStr, CaseSensitivity cs = CaseSensitive) const
+size_t RTCString::count(const char *psz, CaseSensitivity cs = CaseSensitive) const RT_NOEXCEPT
+{
+}
+
+size_t RTCString::count(const RTCString *pStr, CaseSensitivity cs = CaseSensitive) const RT_NOEXCEPT
 {
 
@@ -796 +826 @@
 
 
-RTCString &RTCString::strip()
+RTCString &RTCString::strip() RT_NOEXCEPT
 {
     stripRight();
@@ -803 +833 @@
 
 
-RTCString &RTCString::stripLeft()
+RTCString &RTCString::stripLeft() RT_NOEXCEPT
 {
     char        *psz = m_psz;
@@ -824 +854 @@
 
 
-RTCString &RTCString::stripRight()
+RTCString &RTCString::stripRight() RT_NOEXCEPT
 {
     char  *psz = m_psz;
@@ -888 +918 @@
 }
 
-bool RTCString::endsWith(const RTCString &that, CaseSensitivity cs /*= CaseSensitive*/) const
+bool RTCString::endsWith(const RTCString &that, CaseSensitivity cs /*= CaseSensitive*/) const RT_NOEXCEPT
 {
     size_t l1 = length();
@@ -906 +936 @@
 }
 
-bool RTCString::startsWith(const RTCString &that, CaseSensitivity cs /*= CaseSensitive*/) const
+bool RTCString::startsWith(const RTCString &that, CaseSensitivity cs /*= CaseSensitive*/) const RT_NOEXCEPT
 {
     size_t l1 = length();
@@ -921 +951 @@
 }
 
-bool RTCString::startsWithWord(const char *pszWord, CaseSensitivity enmCase /*= CaseSensitive*/) const
+bool RTCString::startsWithWord(const char *pszWord, CaseSensitivity enmCase /*= CaseSensitive*/) const RT_NOEXCEPT
 {
     const char *pszSrc  = RTStrStripL(c_str()); /** @todo RTStrStripL doesn't use RTUniCpIsSpace (nbsp) */
@@ -940 +970 @@
 }
 
-bool RTCString::startsWithWord(const RTCString &rThat, CaseSensitivity enmCase /*= CaseSensitive*/) const
+bool RTCString::startsWithWord(const RTCString &rThat, CaseSensitivity enmCase /*= CaseSensitive*/) const RT_NOEXCEPT
 {
     return startsWithWord(rThat.c_str(), enmCase);
 }
 
-bool RTCString::contains(const RTCString &that, CaseSensitivity cs /*= CaseSensitive*/) const
+bool RTCString::contains(const RTCString &that, CaseSensitivity cs /*= CaseSensitive*/) const RT_NOEXCEPT
 {
     /** @todo r-bird: Not checking for NULL strings like startsWith does (and
@@ -954 +984 @@
 }
 
-bool RTCString::contains(const char *pszNeedle, CaseSensitivity cs /*= CaseSensitive*/) const
+bool RTCString::contains(const char *pszNeedle, CaseSensitivity cs /*= CaseSensitive*/) const RT_NOEXCEPT
 {
     /** @todo r-bird: Not checking for NULL strings like startsWith does (and
@@ -963 +993 @@
 }
 
-int RTCString::toInt(uint64_t &i) const
+int RTCString::toInt(uint64_t &i) const RT_NOEXCEPT
 {
     if (!m_psz)
@@ -970 +1000 @@
 }
 
-int RTCString::toInt(uint32_t &i) const
+int RTCString::toInt(uint32_t &i) const RT_NOEXCEPT
 {
     if (!m_psz)