儲存庫 vbox 的更動 68474

時間撮記:

2017-8-18 下午03:39:04 (7 年 以前)

作者:

vboxsync

訊息:

cr_error.h: as far as I can tell, we're ending up using the IPRT string formatter if we ever format the strings. So, don't confuse GCC with saying it's standard printf format strings.

檔案:

• trunk/src/VBox/GuestHost/OpenGL/include/cr_error.h (修改) (2 筆差異)

trunk/src/VBox/GuestHost/OpenGL/include/cr_error.h

@@ -12 +12 @@
 #ifdef __cplusplus
 extern "C" {
-#endif
-
-#ifndef __GNUC__
-#define NORETURN_PRINTF
-#define PRINTF
-#elif defined IN_GUEST
-#define NORETURN_PRINTF __attribute__ ((__noreturn__,format(printf,1,2)))
-#define PRINTF __attribute__ ((format(printf,1,2)))
-#else
-#define NORETURN_PRINTF
-#define PRINTF
 #endif
 
@@ -39 +28 @@
 DECLEXPORT(void) crEnableWarnings(int onOff);
 
-DECLEXPORT(void) crDebug(const char *format, ... ) PRINTF;
+DECLEXPORT(void) crDebug(const char *format, ... ) RT_IPRT_FORMAT_ATTR(1, 2);
 DECLEXPORT(void) crDbgCmdPrint(const char *description1, const char *description2, const char *cmd, ...);
 DECLEXPORT(void) crDbgCmdSymLoadPrint(const char *modName, const void*pvAddress);
 #if defined(DEBUG_misha) && defined(RT_OS_WINDOWS)
-typedef void FNCRDEBUG(const char *format, ... ) PRINTF;
+typedef void FNCRDEBUG(const char *format, ... ) RT_IPRT_FORMAT_ATTR(1, 2);
 typedef FNCRDEBUG *PFNCRDEBUG;
 DECLINLINE(PFNCRDEBUG) crGetDebug() {return crDebug;}
 # define crWarning (RT_BREAKPOINT(), crDebug)
 #else
-DECLEXPORT(void) crWarning(const char *format, ... ) PRINTF;
+DECLEXPORT(void) crWarning(const char *format, ... ) RT_IPRT_FORMAT_ATTR(1, 2);
 #endif
-DECLEXPORT(void) crInfo(const char *format, ... ) PRINTF;
+DECLEXPORT(void) crInfo(const char *format, ... ) RT_IPRT_FORMAT_ATTR(1, 2);
 
-DECLEXPORT(void) crError(const char *format, ... ) PRINTF /*NORETURN_PRINTF - it returns*/;
+DECLEXPORT(void) crError(const char *format, ... ) RT_IPRT_FORMAT_ATTR(1, 2);
 
 /* Throw more info while opengl is not stable */