Changeset 101460 in vbox

Timestamp:

Oct 17, 2023 8:32:09 AM (16 months ago)

Author:

vboxsync

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

159529

Message:

Main: Moved Platform::s_platformArchitectureToStr() to Global::stringifyPlatformArchitecture(), so that the client part of VBoxSVC also can make use of this. bugref:10384

Location:

trunk/src/VBox/Main

Files:

• include/Global.h (modified) (1 diff)
• include/PlatformImpl.h (modified) (1 diff)
• src-all/Global.cpp (modified) (1 diff)
• src-server/PlatformImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/Global.h

@@ -202 +202 @@
 
     /**
+     * Stringify a platform architecture to a string.
+     *
+     * @returns Platform architecture as a string.
+     * @param   aEnmArchitecture        Platform architecture to convert.
+     */
+    static const char *stringifyPlatformArchitecture(PlatformArchitecture_T aEnmArchitecture);
+
+    /**
      * Stringify a storage controller type.
      *

trunk/src/VBox/Main/include/PlatformImpl.h

@@ -73 +73 @@
 public:
 
-    // static public helper functions
-    static const char *s_platformArchitectureToStr(PlatformArchitecture_T enmArchitecture);
-
-public:
-
     // wrapped IPlatform properties
     HRESULT getArchitecture(PlatformArchitecture_T *aArchitecture);

trunk/src/VBox/Main/src-all/Global.cpp

@@ -767 +767 @@
 }
 
+/* static */ const char *
+Global::stringifyPlatformArchitecture(PlatformArchitecture_T aEnmArchitecture)
+{
+    switch (aEnmArchitecture)
+    {
+        case PlatformArchitecture_x86: return "x86";
+        case PlatformArchitecture_ARM: return "ARM";
+        default:
+            break;
+    }
+
+    AssertFailedReturn("<None>");
+}
+
 #if 0 /* unused */
 

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

@@ -528 +528 @@
 
     return setErrorBoth(VBOX_E_PLATFORM_ARCH_NOT_SUPPORTED, VERR_PLATFORM_ARCH_NOT_SUPPORTED,
-                        "Platform '%s' not supported", Platform::s_platformArchitectureToStr(m->bd->architectureType));
+                        "Platform '%s' not supported", Global::stringifyPlatformArchitecture(m->bd->architectureType));
 }
 
@@ -564 +564 @@
 
     return setErrorBoth(VBOX_E_PLATFORM_ARCH_NOT_SUPPORTED, VERR_PLATFORM_ARCH_NOT_SUPPORTED,
-                            "Platform '%s' not supported", Platform::s_platformArchitectureToStr(m->bd->architectureType));
+                            "Platform '%s' not supported", Global::stringifyPlatformArchitecture(m->bd->architectureType));
 }
 
@@ -751 +751 @@
     {
         m->bd->architectureType = aArchitecture;
-        LogRel(("Platform architecture set to '%s'\n", Platform::s_platformArchitectureToStr(m->bd->architectureType)));
+        LogRel(("Platform architecture set to '%s'\n", Global::stringifyPlatformArchitecture(m->bd->architectureType)));
     }
 
@@ -848 +848 @@
 }
 
-/**
- * Converts a platform architecture to a string.
- *
- * @returns Platform architecture as a string.
- * @param   enmArchitecture         Platform architecture to convert.
- */
-/* static */
-const char *Platform::s_platformArchitectureToStr(PlatformArchitecture_T enmArchitecture)
-{
-    switch (enmArchitecture)
-    {
-        case PlatformArchitecture_x86: return "x86";
-        case PlatformArchitecture_ARM: return "ARM";
-        default:
-            break;
-    }
-
-    AssertFailedReturn("<None>");
-}
-