Changeset 92842 in vbox

Timestamp:

Dec 9, 2021 9:51:57 AM (3 years ago)

Author:

vboxsync

Message:

Main: bugref:1909: Fixed type conversion for atomic variable

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxManage.cpp (modified) (4 diffs)
• VBoxManageHelp.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -319 +319 @@
                 'const uint32_t g_cHelpLangEntries = RT_ELEMENTS(g_apHelpLangEntries);' \
                 '' \
-                'void * volatile g_pHelpLangEntry = (void *)&g_apHelpLangEntries[0];'\
+                'PHELP_LANG_ENTRY volatile g_pHelpLangEntry = &g_apHelpLangEntries[0];'\
                 ''
         $(QUIET)$(CP) --changed -- "$@" "$(patsubst %.ts,%,$@)"
@@ -366 +366 @@
                 'extern const uint32_t  g_cHelpLangEntries;' \
                 '' \
-                'extern void * volatile g_pHelpLangEntry;' \
+                'extern PHELP_LANG_ENTRY volatile g_pHelpLangEntry;' \
                 '' \
                 'RT_C_DECLS_END' \

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -511 +511 @@
     if (pszLang == NULL || pszLang[0] == 0 || (pszLang[0] == 'C' && pszLang[1] == 0))
         pszLang = "en_US";
-    void *pHelpLangEntry = NULL;
+    PHELP_LANG_ENTRY pHelpLangEntry = NULL;
     /* find language entry matching exactly pszLang */
     for (uint32_t i = 0; i < g_cHelpLangEntries; i++)
@@ -517 +517 @@
         if (strcmp(g_apHelpLangEntries[i].pszLang, pszLang) == 0)
         {
-            pHelpLangEntry = (void *)&g_apHelpLangEntries[i];
+            pHelpLangEntry = &g_apHelpLangEntries[i];
             break;
         }
@@ -530 +530 @@
                 && memcmp(g_apHelpLangEntries[i].pszLang, pszLang, cbLang) == 0)
             {
-                pHelpLangEntry = (void *)&g_apHelpLangEntries[i];
+                pHelpLangEntry = &g_apHelpLangEntries[i];
                 break;
             }
@@ -537 +537 @@
     /* set to en_US (i.e. untranslated) if not found */
     if (pHelpLangEntry == NULL)
-        pHelpLangEntry = (void *)&g_apHelpLangEntries[0];
-
-     ASMAtomicWritePtrVoid(&g_pHelpLangEntry, pHelpLangEntry);
+        pHelpLangEntry = &g_apHelpLangEntries[0];
+
+    ASMAtomicWritePtr(&g_pHelpLangEntry, pHelpLangEntry);
 #else
     NOREF(pszLang);

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -114 +114 @@
     uint32_t cFound = 0;
 #ifdef VBOX_WITH_VBOXMANAGE_NLS
-    HELP_LANG_ENTRY *pHelpLangEntry[2] = {(HELP_LANG_ENTRY *)ASMAtomicReadPtr(&g_pHelpLangEntry), &g_apHelpLangEntries[0] };
+    PHELP_LANG_ENTRY pHelpLangEntry[2] = {ASMAtomicReadPtrT(&g_pHelpLangEntry, PHELP_LANG_ENTRY), &g_apHelpLangEntries[0] };
 #else
-    HELP_LANG_ENTRY *pHelpLangEntry[1] = {(HELP_LANG_ENTRY *)g_pHelpLangEntry};
+    PHELP_LANG_ENTRY pHelpLangEntry[1] = {(PHELP_LANG_ENTRY)g_pHelpLangEntry};
 #endif
     /* Try to find translated, then untranslated */
@@ -176 +176 @@
     uint32_t cFound = 0;
 #ifdef VBOX_WITH_VBOXMANAGE_NLS
-    HELP_LANG_ENTRY *pHelpLangEntry[2] = {(HELP_LANG_ENTRY *)ASMAtomicReadPtr(&g_pHelpLangEntry), &g_apHelpLangEntries[0] };
+    PHELP_LANG_ENTRY pHelpLangEntry[2] = {ASMAtomicReadPtrT(&g_pHelpLangEntry, PHELP_LANG_ENTRY), &g_apHelpLangEntries[0] };
 #else
-    HELP_LANG_ENTRY *pHelpLangEntry[1] = {(HELP_LANG_ENTRY *)g_pHelpLangEntry};
+    PHELP_LANG_ENTRY pHelpLangEntry[1] = {(PHELP_LANG_ENTRY)g_pHelpLangEntry};
 #endif
     /* Try to find translated, then untranslated */
@@ -1036 +1036 @@
         uint32_t cPendingBlankLines = 0;
 #ifdef VBOX_WITH_VBOXMANAGE_NLS
-        HELP_LANG_ENTRY *pHelpLangEntry = (HELP_LANG_ENTRY *)ASMAtomicReadPtr(&g_pHelpLangEntry);
+        PHELP_LANG_ENTRY pHelpLangEntry = ASMAtomicReadPtrT(&g_pHelpLangEntry, PHELP_LANG_ENTRY);
 #else
-        HELP_LANG_ENTRY *pHelpLangEntry = (HELP_LANG_ENTRY *)g_pHelpLangEntry;
+        PHELP_LANG_ENTRY pHelpLangEntry = (PHELP_LANG_ENTRY)g_pHelpLangEntry;
 #endif
         for (uint32_t i = 0; i < pHelpLangEntry->cHelpEntries; i++)