Changeset 85160 in vbox for trunk/src/VBox/Runtime/common

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

Location:

trunk/src/VBox/Runtime/common

Files:

• dbg/dbgmodcontainer.cpp (modified) (1 diff)
• log/tracelogreader.cpp (modified) (3 diffs)
• path/RTPathParentLength.cpp (modified) (1 diff)
• string/ministring.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp

@@ -993 +993 @@
  *                      created manually later on.
  */
-int rtDbgModContainerCreate(PRTDBGMODINT pMod, RTUINTPTR cbSeg)
+DECLHIDDEN(int) rtDbgModContainerCreate(PRTDBGMODINT pMod, RTUINTPTR cbSeg)
 {
     PRTDBGMODCTN pThis = (PRTDBGMODCTN)RTMemAlloc(sizeof(*pThis));

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

trunk/src/VBox/Runtime/common/path/RTPathParentLength.cpp

@@ -87 +87 @@
  *          double-slash prefix as parent.
  */
-size_t RTPathParentLength(const char *pszPath)
+RTDECL(size_t) RTPathParentLength(const char *pszPath)
 {
 #if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS

trunk/src/VBox/Runtime/common/string/ministring.cpp

@@ -1144 +1144 @@
 }
 
-const RTCString operator+(const RTCString &a_rStr1, const RTCString &a_rStr2)
+RTDECL(const RTCString) operator+(const RTCString &a_rStr1, const RTCString &a_rStr2)
 {
     RTCString strRet(a_rStr1);
@@ -1151 +1151 @@
 }
 
-const RTCString operator+(const RTCString &a_rStr1, const char *a_pszStr2)
+RTDECL(const RTCString) operator+(const RTCString &a_rStr1, const char *a_pszStr2)
 {
     RTCString strRet(a_rStr1);
@@ -1158 +1158 @@
 }
 
-const RTCString operator+(const char *a_psz1, const RTCString &a_rStr2)
+RTDECL(const RTCString) operator+(const char *a_psz1, const RTCString &a_rStr2)
 {
     RTCString strRet(a_psz1);