Changeset 67642 in vbox

Timestamp:

Jun 27, 2017 3:38:21 PM (8 years ago)

Author:

vboxsync

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

116416

Message:

Main: Modified Utf8Str::parseKeyValue implementation to never return npos when returning the last pair. That simplifies using the method and seemingly reflects the original author's intentions.

Location:

trunk

Files:

• include/VBox/com/string.h (modified) (1 diff)
• src/VBox/Main/glue/string.cpp (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (3 diffs)
• src/VBox/Main/src-client/VideoRec.cpp (modified) (1 diff)
• src/VBox/Main/src-server/VirtualBoxImpl.cpp (modified) (1 diff)

trunk/include/VBox/com/string.h

@@ -768 +768 @@
      *
      * @returns offset of the @a a_rPairSeparator following the returned value.
-     * @retval  npos is returned if there are no more key/value pairs, or if the
-     *          final key/value pair isn't followed by a @a a_rPairSeparator.
+     * @retval  npos is returned if there are no more key/value pairs.
      *
      * @param   a_rKey                  Reference to variable that should receive

trunk/src/VBox/Main/glue/string.cpp

@@ -209 +209 @@
     if (offKeyValueSep < offEnd)
     {
-        a_rKey   = substr(a_offStart, offKeyValueSep - a_offStart);
+        a_rKey = substr(a_offStart, offKeyValueSep - a_offStart);
+        if (offEnd == npos)
+            offEnd = m_cch; /* No confusing npos when returning strings. */
         a_rValue = substr(offKeyValueSep + 1, offEnd - offKeyValueSep - 1);
     }

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1247 +1247 @@
                 size_t       uPos = 0;
                 com::Utf8Str strDebugOptions = strParavirtDebug;
-                do
-                {
-                    com::Utf8Str strKey;
-                    com::Utf8Str strVal;
-                    uPos = strDebugOptions.parseKeyValue(strKey, strVal, uPos);
+                com::Utf8Str strKey;
+                com::Utf8Str strVal;
+                while ((uPos = strDebugOptions.parseKeyValue(strKey, strVal, uPos)) != com::Utf8Str::npos)
+                {
                     if (strKey == "enabled")
                     {
@@ -1276 +1275 @@
                     else if (strKey == "hypercallinterface")
                         fGimHvHypercallIf = RT_BOOL(strVal.toUInt32());
-                    else if (strKey.isNotEmpty() || strVal.isNotEmpty())
+                    else
                     {
                         AssertMsgFailed(("Unrecognized Hyper-V debug option '%s'\n", strKey.c_str()));
@@ -1283 +1282 @@
                                             strDebugOptions.c_str());
                     }
-                } while (uPos != com::Utf8Str::npos);
+                }
 
                 /* Update HyperV CFGM node with active debug options. */

trunk/src/VBox/Main/src-client/VideoRec.cpp

@@ -771 +771 @@
 #endif
 
-    /** @todo r=bird: This code will ignore the final value/pair iff the option
-     *        string doesn't end with a comma. */
     com::Utf8Str key, value;
     while ((pos = options.parseKeyValue(key, value, pos)) != com::Utf8Str::npos)

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -1333 +1333 @@
     LogFlowThisFunc(("aName=\"%s\",aBaseFolder=\"%s\"\n", strName.c_str(), strBase.c_str()));
 
-    Guid id;
+    com::Guid id;
     bool fDirectoryIncludesUUID = false;
     if (!aCreateFlags.isEmpty())
     {
         size_t uPos = 0;
-        do {
-
-            com::Utf8Str strKey, strValue;
-            uPos = aCreateFlags.parseKeyValue(strKey, strValue, uPos);
-
+        com::Utf8Str strKey;
+        com::Utf8Str strValue;
+        while ((uPos = aCreateFlags.parseKeyValue(strKey, strValue, uPos)) != com::Utf8Str::npos)
+        {
             if (strKey == "UUID")
                 id = strValue.c_str();
             else if (strKey == "directoryIncludesUUID")
                 fDirectoryIncludesUUID = (strValue == "1");
-
-        } while (uPos != com::Utf8Str::npos);
+        }
     }