Changeset 36561 in vbox for trunk/src/VBox

Timestamp:

Apr 5, 2011 1:42:59 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

70996

Message:

RTCString::join: Optimization.

Location:

trunk/src/VBox/Runtime

Files:

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

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

@@ -368 +368 @@
     if (a_rList.size() > 1)
     {
+        /* calc the required size */
+        size_t cbNeeded = a_rstrSep.length() * (a_rList.size() - 1) + 1;
+        for (size_t i = 0; i < a_rList.size(); ++i)
+            cbNeeded += a_rList.at(i).length();
+        strRet.reserve(cbNeeded);
+
+        /* do the appending. */
         for (size_t i = 0; i < a_rList.size() - 1; ++i)
-            strRet += a_rList.at(i) + a_rstrSep;
-    }
-    if (a_rList.size() > 0)
-        strRet += a_rList.last();
+        {
+            strRet.append(a_rList.at(i));
+            strRet.append(a_rstrSep);
+        }
+        strRet.append(a_rList.last());
+    }
+    /* special case: one list item. */
+    else if (a_rList.size() > 0)
+        strRet.append(a_rList.last());
 
     return strRet;

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

@@ -282 +282 @@
     strTest = RTCString::join(jnList, "##");
     RTTESTI_CHECK(strTest == "");
+
     jnList.append("abcdef");
     strTest = RTCString::join(jnList, "##");
     RTTESTI_CHECK(strTest == "abcdef");
-    for (size_t i = 0; i < 4; ++i)
+
+    jnList.append("abcdef");
+    strTest = RTCString::join(jnList, ";");
+    RTTESTI_CHECK(strTest == "abcdef;abcdef");
+
+    for (size_t i = 0; i < 3; ++i)
         jnList.append("abcdef");
     strTest = RTCString::join(jnList);