Changeset 85160 in vbox for trunk/src/VBox/Runtime/common/log/tracelogreader.cpp

Timestamp:

Jul 10, 2020 9:01:02 AM (5 years ago)

Author:

vboxsync

Message:

*: Some missing DECLCALLBACK/RTDECL and related nothrow issues raised by Clang. bugref:9794 bugref:9790

File:

• trunk/src/VBox/Runtime/common/log/tracelogreader.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/log/tracelogreader.cpp

@@ -239 +239 @@
 
 /*********************************************************************************************************************************
-*   Defined Constants And Macros                                                                                                 *
+*   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-
 static DECLCALLBACK(int) rtTraceLogRdrHdrRecvd(PRTTRACELOGRDRINT pThis, RTTRACELOGRDRPOLLEVT *penmEvt, bool *pfContinuePoll);
 static DECLCALLBACK(int) rtTraceLogRdrHdrDescRecvd(PRTTRACELOGRDRINT pThis, RTTRACELOGRDRPOLLEVT *penmEvt, bool *pfContinuePoll);
@@ -256 +255 @@
 /**
  * State handlers.
- */
-static PFNRTTRACELOGRDRSTATEHANDLER g_apfnStateHandlers[] =
-{
-    NULL,
-    rtTraceLogRdrHdrRecvd,
-    rtTraceLogRdrHdrDescRecvd,
-    rtTraceLogRdrMagicRecvd,
-    rtTraceLogRdrEvtDescRecvd,
-    rtTraceLogRdrEvtDescIdRecvd,
-    rtTraceLogRdrEvtDescDescriptionRecvd,
-    rtTraceLogRdrEvtItemDescRecvd,
-    rtTraceLogRdrEvtItemDescNameRecvd,
-    rtTraceLogRdrEvtItemDescDescriptionRecvd,
-    rtTraceLogRdrEvtMarkerRecvd,
-    rtTraceLogRdrEvtDataRecvd,
-    NULL
+ * @note The struct wrapper is for working around a Clang nothrow attrib oddity.
+ */
+static struct { PFNRTTRACELOGRDRSTATEHANDLER pfn; } g_aStateHandlers[] =
+{
+    { NULL },
+    { rtTraceLogRdrHdrRecvd },
+    { rtTraceLogRdrHdrDescRecvd },
+    { rtTraceLogRdrMagicRecvd },
+    { rtTraceLogRdrEvtDescRecvd },
+    { rtTraceLogRdrEvtDescIdRecvd },
+    { rtTraceLogRdrEvtDescDescriptionRecvd },
+    { rtTraceLogRdrEvtItemDescRecvd },
+    { rtTraceLogRdrEvtItemDescNameRecvd },
+    { rtTraceLogRdrEvtItemDescDescriptionRecvd },
+    { rtTraceLogRdrEvtMarkerRecvd },
+    { rtTraceLogRdrEvtDataRecvd },
+    { NULL }
 };
 
@@ -1570 +1570 @@
             {
                 /* Act according to the current state. */
-                rc = g_apfnStateHandlers[pThis->enmState](pThis, penmEvt, &fContinue);
+                rc = g_aStateHandlers[pThis->enmState].pfn(pThis, penmEvt, &fContinue);
             }
             else