Changeset 105338 in vbox for trunk/src

Timestamp:

Jul 16, 2024 8:19:51 AM (5 months ago)

Author:

vboxsync

Message:

XPCOM/IPCM: Calling convention fixes. bugref:10725

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcCommandModule.cpp (modified) (4 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcCommandModule.cpp

@@ -46 +46 @@
 #include <VBox/log.h>
 
-typedef void FNIPCMMSGHANDLER(PIPCDCLIENT pIpcClient, PCIPCMSG pMsg);
+typedef DECLCALLBACKTYPE(void, FNIPCMMSGHANDLER,(PIPCDCLIENT pIpcClient, PCIPCMSG pMsg));
 /** Pointer to a IPCM message handler. */
 typedef FNIPCMMSGHANDLER *PFNIPCMMSGHANDLER;
@@ -223 +223 @@
 DECLHIDDEN(void) IPCM_HandleMsg(PIPCDCLIENT pIpcClient, PCIPCMSG pMsg)
 {
-    static const PFNIPCMMSGHANDLER aHandlers[] =
-    {
-        ipcmOnPing,
-        ipcmOnForward,
-        ipcmOnClientHello,
-        ipcmOnClientAddName,
-        ipcmOnClientDelName,
-        ipcmOnClientAddTarget,
-        ipcmOnClientDelTarget,
-        ipcmOnQueryClientByName
+    static const struct CLANG11NONSENSE { PFNIPCMMSGHANDLER pfn; } s_aHandlers[] =
+    {
+        { ipcmOnPing              },
+        { ipcmOnForward           },
+        { ipcmOnClientHello       },
+        { ipcmOnClientAddName     },
+        { ipcmOnClientDelName     },
+        { ipcmOnClientAddTarget   },
+        { ipcmOnClientDelTarget   },
+        { ipcmOnQueryClientByName },
     };
 
@@ -246 +246 @@
     u32Type &= ~IPCM_MSG_CLASS_REQ;
     u32Type--;
-    if (u32Type >= RT_ELEMENTS(aHandlers))
+    if (u32Type >= RT_ELEMENTS(s_aHandlers))
     {
         Log(("unknown request -- ignoring message\n"));
@@ -252 +252 @@
     }
 
-    aHandlers[u32Type](pIpcClient, pMsg);
-}
+    s_aHandlers[u32Type].pfn(pIpcClient, pMsg);
+}