Changeset 101344 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Oct 4, 2023 7:35:14 PM (19 months ago)

Author:

vboxsync

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

159345

Message:

Main/Settings.cpp: Fixed incorrect and inefficient (you don't use find) endsWith() emulation in MachineConfigFile::convertGuestOSTypeSuffix (regression from r159257). Use new RTCString::endsWith methods. Untested. bugref:10384

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (6 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -6826 +6826 @@
 }
 
-const struct {
+static struct
+{
     const char *pcszOld;
     const char *pcszNew;
-} aConvertGuestOSTypesPre1_5[] =
+} const g_aConvertGuestOSTypesPre1_5[] =
 {
     { "unknown", "Other" },
@@ -6868 +6869 @@
 };
 
+/* static */
 void MachineConfigFile::convertGuestOSTypeFromPre1_5(Utf8Str &str)
 {
-    for (size_t u = 0; u < RT_ELEMENTS(aConvertGuestOSTypesPre1_5); ++u)
-        if (str == aConvertGuestOSTypesPre1_5[u].pcszOld)
-        {
-            str = aConvertGuestOSTypesPre1_5[u].pcszNew;
+    for (size_t idx = 0; idx < RT_ELEMENTS(g_aConvertGuestOSTypesPre1_5); ++idx)
+        if (str == g_aConvertGuestOSTypesPre1_5[idx].pcszOld)
+        {
+            str = g_aConvertGuestOSTypesPre1_5[idx].pcszNew;
             break;
         }
@@ -6881 +6883 @@
  * Static function to convert a guest OS type ID suffix.
  *
- * @returns \c true if suffix got converted, or \c false if not.
  * @param   strOsType               Guest OS type ID to convert.
  * @param   pszToReplace            Suffix to replace.
@@ -6887 +6888 @@
  */
 /* static */
-bool MachineConfigFile::convertGuestOSTypeSuffix(com::Utf8Str &strOsType, const char *pszToReplace, const char *pszReplacement)
-{
-    AssertPtrReturn(pszToReplace, false);
-    AssertPtrReturn(pszReplacement, false);
-
-    size_t const cchSuffix = strlen(pszToReplace);
-    size_t const idxSuffix = strOsType.find(pszToReplace);
-    if (idxSuffix == strOsType.length() - cchSuffix) /* Be extra cautious to only replace the real suffix. */
-    {
-        strOsType.replace(idxSuffix, cchSuffix, pszReplacement);
-        return true;
-    }
-    return false;
+void MachineConfigFile::convertGuestOSTypeSuffix(com::Utf8Str &strOsType, const char *pszToReplace, const char *pszReplacement)
+{
+    size_t const cchToReplace = strlen(pszToReplace);
+    if (strOsType.endsWith(pszToReplace, cchToReplace))
+        strOsType.replace(strOsType.length() - cchToReplace, cchToReplace, pszReplacement);
 }
 
@@ -6913 +6906 @@
  *          compatibility with older VBox versions.
  */
+/* static */
 void MachineConfigFile::convertGuestOSTypeFromPre1_20(Utf8Str &str)
 {
@@ -6927 +6921 @@
  *          know about the new suffix.
  */
+/* static */
 void MachineConfigFile::convertGuestOSTypeToPre1_20(Utf8Str &str)
 {