Changeset 64964 in vbox

Timestamp:

Dec 19, 2016 3:11:39 PM (8 years ago)

Author:

vboxsync

Message:

Main/VirtualBox: no need to do the fix to sanitiseMachineFilename() twice

File:

• trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp (modified) (1 diff)

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

@@ -1430 +1430 @@
     };
 
-    if (!strName.isEmpty())
-    {
-        char *pszName = strName.mutableRaw();
-        ssize_t cReplacements = RTStrPurgeComplementSet(pszName, s_uszValidRangePairs, '_');
-        Assert(cReplacements >= 0);
-        NOREF(cReplacements);
-
-        /* No leading dot or dash. */
-        if (pszName[0] == '.' || pszName[0] == '-')
-            pszName[0] = '_';
-
-        /* No trailing dot. */
-        if (pszName[strName.length() - 1] == '.')
-            pszName[strName.length() - 1] = '_';
-
-        /* Mangle leading and trailing spaces. */
-        for (size_t i = 0; pszName[i] == ' '; ++i)
-            pszName[i] = '_';
-        for (size_t i = strName.length() - 1; i && pszName[i] == ' '; --i)
-            pszName[i] = '_';
-    }
+    char *pszName = strName.mutableRaw();
+    ssize_t cReplacements = RTStrPurgeComplementSet(pszName, s_uszValidRangePairs, '_');
+    Assert(cReplacements >= 0);
+    NOREF(cReplacements);
+
+    /* No leading dot or dash. */
+    if (pszName[0] == '.' || pszName[0] == '-')
+        pszName[0] = '_';
+
+    /* No trailing dot. */
+    if (pszName[strName.length() - 1] == '.')
+        pszName[strName.length() - 1] = '_';
+
+    /* Mangle leading and trailing spaces. */
+    for (size_t i = 0; pszName[i] == ' '; ++i)
+        pszName[i] = '_';
+    for (size_t i = strName.length() - 1; i && pszName[i] == ' '; --i)
+        pszName[i] = '_';
 }