Changeset 85095 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Jul 7, 2020 6:55:26 PM (5 years ago)

Author:

vboxsync

Message:

SUP: No need to use RT_NOTHROW_* with DECL_HIDDEN_NOTHROW, at least not if it isn't consistently done. bugref:9794

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPLibInternal.h (modified) (3 diffs)
• SUPR3HardenedMain.cpp (modified) (7 diffs)

trunk/src/VBox/HostDrivers/Support/SUPLibInternal.h

@@ -131 +131 @@
 # define suplibHardenedStrNCmp strncmp
 #endif
-DECLNORETURN(void)  suplibHardenedExit(RTEXITCODE rcExit) RT_NO_THROW_PROTO;
-DECL_HIDDEN_NOTHROW(void)   suplibHardenedPrintF(const char *pszFormat, ...) RT_NO_THROW_PROTO;
-DECL_HIDDEN_NOTHROW(void)   suplibHardenedPrintFV(const char *pszFormat, va_list va) RT_NO_THROW_PROTO;
+DECL_HIDDEN_NOTHROW(DECLNORETURN(void)) suplibHardenedExit(RTEXITCODE rcExit);
+DECL_HIDDEN_NOTHROW(void)   suplibHardenedPrintF(const char *pszFormat, ...);
+DECL_HIDDEN_NOTHROW(void)   suplibHardenedPrintFV(const char *pszFormat, va_list va);
 
 /** @} */
@@ -401 +401 @@
  */
 DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatalMsgV(const char *pszWhere, SUPINITOP enmWhat, int rc,
-                                                                 const char *pszMsgFmt, va_list va) RT_NO_THROW_PROTO;
+                                                                 const char *pszMsgFmt, va_list va);
 
 /**
@@ -407 +407 @@
  */
 DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatalMsg(const char *pszWhere, SUPINITOP enmWhat, int rc,
-                                                                const char *pszMsgFmt, ...) RT_NO_THROW_PROTO;
+                                                                const char *pszMsgFmt, ...);
 
 /**
  * Display a fatal error and quit.
  */
-DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatalV(const char *pszFormat, va_list va) RT_NO_THROW_PROTO;
+DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatalV(const char *pszFormat, va_list va);
 
 /**
  * Display a fatal error and quit.
  */
-DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatal(const char *pszFormat, ...) RT_NO_THROW_PROTO;
+DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatal(const char *pszFormat, ...);
 
 /**
  * Display an error which may or may not be fatal.
  */
-DECL_HIDDEN_NOTHROW(int)    supR3HardenedErrorV(int rc, bool fFatal, const char *pszFormat, va_list va) RT_NO_THROW_PROTO;
+DECL_HIDDEN_NOTHROW(int)    supR3HardenedErrorV(int rc, bool fFatal, const char *pszFormat, va_list va);
 
 /**
  * Display an error which may or may not be fatal.
  */
-DECL_HIDDEN_NOTHROW(int)    supR3HardenedError(int rc, bool fFatal, const char *pszFormat, ...) RT_NO_THROW_PROTO;
+DECL_HIDDEN_NOTHROW(int)    supR3HardenedError(int rc, bool fFatal, const char *pszFormat, ...);
 
 /**
  * Open any startup log file specified in the argument.
  */
-DECL_HIDDEN_NOTHROW(void)   supR3HardenedOpenLog(int *pcArgs, char **papszArgs) RT_NO_THROW_PROTO;
+DECL_HIDDEN_NOTHROW(void)   supR3HardenedOpenLog(int *pcArgs, char **papszArgs);
 
 /**
  * Write to the startup log file.
  */
-DECL_HIDDEN_NOTHROW(void)   supR3HardenedLogV(const char *pszFormat, va_list va) RT_NO_THROW_PROTO;
+DECL_HIDDEN_NOTHROW(void)   supR3HardenedLogV(const char *pszFormat, va_list va);
 
 /**
  * Write to the startup log file.
  */
-DECL_HIDDEN_NOTHROW(void)   supR3HardenedLog(const char *pszFormat, ...) RT_NO_THROW_PROTO;
+DECL_HIDDEN_NOTHROW(void)   supR3HardenedLog(const char *pszFormat, ...);
 
 /**
  * Flushes the log file.
  */
-DECL_HIDDEN_NOTHROW(void)   supR3HardenedLogFlush(void) RT_NO_THROW_PROTO;
+DECL_HIDDEN_NOTHROW(void)   supR3HardenedLogFlush(void);
 
 

trunk/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp

@@ -671 +671 @@
  * @param   rcExit      The exit code.
  */
-DECLNORETURN(void) suplibHardenedExit(RTEXITCODE rcExit) RT_NO_THROW_DEF
+DECL_HIDDEN_NOTHROW(DECLNORETURN(void)) suplibHardenedExit(RTEXITCODE rcExit)
 {
     for (;;)
@@ -888 +888 @@
  * @param   va          Arguments to format.
  */
-DECL_HIDDEN_NOTHROW(void) suplibHardenedPrintFV(const char *pszFormat, va_list va) RT_NO_THROW_DEF
+DECL_HIDDEN_NOTHROW(void) suplibHardenedPrintFV(const char *pszFormat, va_list va)
 {
 #ifdef IPRT_NO_CRT
@@ -1122 +1122 @@
  * @param   ...         Arguments to format.
  */
-DECL_HIDDEN_NOTHROW(void) suplibHardenedPrintF(const char *pszFormat, ...) RT_NO_THROW_DEF
+DECL_HIDDEN_NOTHROW(void) suplibHardenedPrintF(const char *pszFormat, ...)
 {
     va_list va;
@@ -1459 +1459 @@
 #endif
 
-DECL_HIDDEN_NOTHROW(void) supR3HardenedOpenLog(int *pcArgs, char **papszArgs) RT_NO_THROW_DEF
+DECL_HIDDEN_NOTHROW(void) supR3HardenedOpenLog(int *pcArgs, char **papszArgs)
 {
     static const char s_szLogOption[] = "--sup-hardening-log=";
@@ -1527 +1527 @@
 
 
-DECL_HIDDEN_NOTHROW(void) supR3HardenedLogV(const char *pszFormat, va_list va) RT_NO_THROW_DEF
+DECL_HIDDEN_NOTHROW(void) supR3HardenedLogV(const char *pszFormat, va_list va)
 {
 #ifdef RT_OS_WINDOWS
@@ -1559 +1559 @@
 
 
-DECL_HIDDEN_NOTHROW(void) supR3HardenedLog(const char *pszFormat,  ...) RT_NO_THROW_DEF
+DECL_HIDDEN_NOTHROW(void) supR3HardenedLog(const char *pszFormat,  ...)
 {
     va_list va;
@@ -1568 +1568 @@
 
 
-DECL_HIDDEN_NOTHROW(void) supR3HardenedLogFlush(void) RT_NO_THROW_DEF
+DECL_HIDDEN_NOTHROW(void) supR3HardenedLogFlush(void)
 {
 #ifdef RT_OS_WINDOWS