VirtualBox

Changeset 85160 in vbox


Ignore:
Timestamp:
Jul 10, 2020 9:01:02 AM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
139123
Message:

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

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/iprt/cpp/xml.h

    r85121 r85160  
    363363 */
    364364
     365
     366#if RT_CLANG_PREREQ(4, 0) /* VC++ needs the nothrow'ed-ness, while clang barfs at it. */
     367typedef xmlParserInput *FNEXTERNALENTITYLOADER(const char *aURI, const char *aID, xmlParserCtxt *aCtxt);
     368#else
    365369typedef DECLCALLBACKTYPE_EX(xmlParserInput *, RT_NOTHING, FNEXTERNALENTITYLOADER,(const char *aURI, const char *aID,
    366370                                                                                  xmlParserCtxt *aCtxt));
    367 typedef FNEXTERNALENTITYLOADER *PFNEXTERNALENTITYLOADER;
     371#endif
     372typedef FNEXTERNALENTITYLOADER *PFNEXTERNALENTITYLOADER; /**< xmlExternalEntityLoader */
    368373
    369374class RT_DECL_CLASS GlobalLock

  • trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

    r85124 r85160  
    167167
    168168
    169 DECLEXPORT(int) supR3PreInit(PSUPPREINITDATA pPreInitData, uint32_t fFlags)
     169DECL_NOTHROW(DECLEXPORT(int)) supR3PreInit(PSUPPREINITDATA pPreInitData, uint32_t fFlags)
    170170{
    171171    /*

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

    r82968 r85160  
    993993 *                      created manually later on.
    994994 */
    995 int rtDbgModContainerCreate(PRTDBGMODINT pMod, RTUINTPTR cbSeg)
     995DECLHIDDEN(int) rtDbgModContainerCreate(PRTDBGMODINT pMod, RTUINTPTR cbSeg)
    996996{
    997997    PRTDBGMODCTN pThis = (PRTDBGMODCTN)RTMemAlloc(sizeof(*pThis));

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

    r85121 r85160  
    239239
    240240/*********************************************************************************************************************************
    241 *   Defined Constants And Macros                                                                                                 *
     241*   Internal Functions                                                                                                           *
    242242*********************************************************************************************************************************/
    243 
    244243static DECLCALLBACK(int) rtTraceLogRdrHdrRecvd(PRTTRACELOGRDRINT pThis, RTTRACELOGRDRPOLLEVT *penmEvt, bool *pfContinuePoll);
    245244static DECLCALLBACK(int) rtTraceLogRdrHdrDescRecvd(PRTTRACELOGRDRINT pThis, RTTRACELOGRDRPOLLEVT *penmEvt, bool *pfContinuePoll);
    … …  
    256255/**
    257256 * State handlers.
    258  */
    259 static PFNRTTRACELOGRDRSTATEHANDLER g_apfnStateHandlers[] =
    260 {
    261     NULL,
    262     rtTraceLogRdrHdrRecvd,
    263     rtTraceLogRdrHdrDescRecvd,
    264     rtTraceLogRdrMagicRecvd,
    265     rtTraceLogRdrEvtDescRecvd,
    266     rtTraceLogRdrEvtDescIdRecvd,
    267     rtTraceLogRdrEvtDescDescriptionRecvd,
    268     rtTraceLogRdrEvtItemDescRecvd,
    269     rtTraceLogRdrEvtItemDescNameRecvd,
    270     rtTraceLogRdrEvtItemDescDescriptionRecvd,
    271     rtTraceLogRdrEvtMarkerRecvd,
    272     rtTraceLogRdrEvtDataRecvd,
    273     NULL
     257 * @note The struct wrapper is for working around a Clang nothrow attrib oddity.
     258 */
     259static struct { PFNRTTRACELOGRDRSTATEHANDLER pfn; } g_aStateHandlers[] =
     260{
     261    { NULL },
     262    { rtTraceLogRdrHdrRecvd },
     263    { rtTraceLogRdrHdrDescRecvd },
     264    { rtTraceLogRdrMagicRecvd },
     265    { rtTraceLogRdrEvtDescRecvd },
     266    { rtTraceLogRdrEvtDescIdRecvd },
     267    { rtTraceLogRdrEvtDescDescriptionRecvd },
     268    { rtTraceLogRdrEvtItemDescRecvd },
     269    { rtTraceLogRdrEvtItemDescNameRecvd },
     270    { rtTraceLogRdrEvtItemDescDescriptionRecvd },
     271    { rtTraceLogRdrEvtMarkerRecvd },
     272    { rtTraceLogRdrEvtDataRecvd },
     273    { NULL }
    274274};
    275275
    … …  
    15701570            {
    15711571                /* Act according to the current state. */
    1572                 rc = g_apfnStateHandlers[pThis->enmState](pThis, penmEvt, &fContinue);
     1572                rc = g_aStateHandlers[pThis->enmState].pfn(pThis, penmEvt, &fContinue);
    15731573            }
    15741574            else

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

    r82968 r85160  
    8787 *          double-slash prefix as parent.
    8888 */
    89 size_t RTPathParentLength(const char *pszPath)
     89RTDECL(size_t) RTPathParentLength(const char *pszPath)
    9090{
    9191#if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS

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

    r83252 r85160  
    11441144}
    11451145
    1146 const RTCString operator+(const RTCString &a_rStr1, const RTCString &a_rStr2)
     1146RTDECL(const RTCString) operator+(const RTCString &a_rStr1, const RTCString &a_rStr2)
    11471147{
    11481148    RTCString strRet(a_rStr1);
    … …  
    11511151}
    11521152
    1153 const RTCString operator+(const RTCString &a_rStr1, const char *a_pszStr2)
     1153RTDECL(const RTCString) operator+(const RTCString &a_rStr1, const char *a_pszStr2)
    11541154{
    11551155    RTCString strRet(a_rStr1);
    … …  
    11581158}
    11591159
    1160 const RTCString operator+(const char *a_psz1, const RTCString &a_rStr2)
     1160RTDECL(const RTCString) operator+(const char *a_psz1, const RTCString &a_rStr2)
    11611161{
    11621162    RTCString strRet(a_psz1);

  • trunk/src/VBox/Runtime/generic/ftp-server.cpp

    r85121 r85160  
    343343static void rtFtpServerClientStateReset(PRTFTPSERVERCLIENTSTATE pState);
    344344
    345 /**
    346  * Function prototypes for command handlers.
     345/** @name Command handlers.
     346 * @{
    347347 */
    348348static FNRTFTPSERVERCMD rtFtpServerHandleABOR;
    … …  
    365365static FNRTFTPSERVERCMD rtFtpServerHandleTYPE;
    366366static FNRTFTPSERVERCMD rtFtpServerHandleUSER;
     367/** @} */
    367368
    368369/**
    … …  
    12701271*********************************************************************************************************************************/
    12711272
    1272 static int rtFtpServerHandleABOR(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     1273static DECLCALLBACK(int) rtFtpServerHandleABOR(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    12731274{
    12741275    RT_NOREF(cArgs, apcszArgs);
    … …  
    12861287}
    12871288
    1288 static int rtFtpServerHandleCDUP(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     1289static DECLCALLBACK(int) rtFtpServerHandleCDUP(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    12891290{
    12901291    RT_NOREF(cArgs, apcszArgs);
    … …  
    13221323}
    13231324
    1324 static int rtFtpServerHandleCWD(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     1325static DECLCALLBACK(int) rtFtpServerHandleCWD(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    13251326{
    13261327    if (cArgs != 1)
    … …  
    13441345}
    13451346
    1346 static int rtFtpServerHandleFEAT(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     1347static DECLCALLBACK(int) rtFtpServerHandleFEAT(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    13471348{
    13481349    RT_NOREF(cArgs, apcszArgs);
    … …  
    18621863}
    18631864
    1864 static int rtFtpServerHandleLIST(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     1865static DECLCALLBACK(int) rtFtpServerHandleLIST(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    18651866{
    18661867    /* If no argument is given, use the server's CWD as the path. */
    … …  
    19081909}
    19091910
    1910 static int rtFtpServerHandleMODE(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     1911static DECLCALLBACK(int) rtFtpServerHandleMODE(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    19111912{
    19121913    RT_NOREF(pClient, cArgs, apcszArgs);
    … …  
    19161917}
    19171918
    1918 static int rtFtpServerHandleNOOP(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     1919static DECLCALLBACK(int) rtFtpServerHandleNOOP(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    19191920{
    19201921    RT_NOREF(cArgs, apcszArgs);
    … …  
    19261927}
    19271928
    1928 static int rtFtpServerHandlePASS(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     1929static DECLCALLBACK(int) rtFtpServerHandlePASS(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    19291930{
    19301931    if (cArgs != 1)
    … …  
    19511952}
    19521953
    1953 static int rtFtpServerHandlePORT(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     1954static DECLCALLBACK(int) rtFtpServerHandlePORT(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    19541955{
    19551956    if (cArgs != 1)
    … …  
    19711972}
    19721973
    1973 static int rtFtpServerHandlePWD(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     1974static DECLCALLBACK(int) rtFtpServerHandlePWD(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    19741975{
    19751976    RT_NOREF(cArgs, apcszArgs);
    … …  
    19871988}
    19881989
    1989 static int rtFtpServerHandleOPTS(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     1990static DECLCALLBACK(int) rtFtpServerHandleOPTS(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    19901991{
    19911992    RT_NOREF(cArgs, apcszArgs);
    … …  
    20002001}
    20012002
    2002 static int rtFtpServerHandleQUIT(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     2003static DECLCALLBACK(int) rtFtpServerHandleQUIT(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    20032004{
    20042005    RT_NOREF(cArgs, apcszArgs);
    … …  
    20232024}
    20242025
    2025 static int rtFtpServerHandleRETR(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     2026static DECLCALLBACK(int) rtFtpServerHandleRETR(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    20262027{
    20272028    if (cArgs != 1) /* File name needs to be present. */
    … …  
    20712072}
    20722073
    2073 static int rtFtpServerHandleSIZE(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     2074static DECLCALLBACK(int) rtFtpServerHandleSIZE(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    20742075{
    20752076    if (cArgs != 1)
    … …  
    20962097}
    20972098
    2098 static int rtFtpServerHandleSTAT(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     2099static DECLCALLBACK(int) rtFtpServerHandleSTAT(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    20992100{
    21002101    if (cArgs != 1)
    … …  
    21382139}
    21392140
    2140 static int rtFtpServerHandleSTRU(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     2141static DECLCALLBACK(int) rtFtpServerHandleSTRU(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    21412142{
    21422143    if (cArgs != 1)
    … …  
    21592160}
    21602161
    2161 static int rtFtpServerHandleSYST(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     2162static DECLCALLBACK(int) rtFtpServerHandleSYST(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    21622163{
    21632164    RT_NOREF(cArgs, apcszArgs);
    … …  
    21712172}
    21722173
    2173 static int rtFtpServerHandleTYPE(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     2174static DECLCALLBACK(int) rtFtpServerHandleTYPE(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    21742175{
    21752176    if (cArgs != 1)
    … …  
    21972198}
    21982199
    2199 static int rtFtpServerHandleUSER(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
     2200static DECLCALLBACK(int) rtFtpServerHandleUSER(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs)
    22002201{
    22012202    if (cArgs != 1)
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette