Nikolay Sivov : services/tests: Fix printf-style helper format (Coverity).

Alexandre Julliard julliard at winehq.org
Tue Sep 14 16:00:14 CDT 2021


Module: wine
Branch: master
Commit: 2de886dd7b36bc4819a9518c0ffc54ef3b76bd53
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2de886dd7b36bc4819a9518c0ffc54ef3b76bd53

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Sep 14 22:24:50 2021 +0300

services/tests: Fix printf-style helper format (Coverity).

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 programs/services/tests/service.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c
index 4eebbc432df..93eff0e36f0 100644
--- a/programs/services/tests/service.c
+++ b/programs/services/tests/service.c
@@ -26,6 +26,12 @@
 
 #include "wine/test.h"
 
+#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__)
+#define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args)))
+#else
+#define __WINE_PRINTF_ATTR(fmt,args)
+#endif
+
 static SERVICE_STATUS_HANDLE (WINAPI *pRegisterServiceCtrlHandlerExA)(LPCSTR,LPHANDLER_FUNCTION_EX,LPVOID);
 
 static HANDLE pipe_handle = INVALID_HANDLE_VALUE;
@@ -56,6 +62,7 @@ static inline void service_event(const char *event)
     send_msg("EVENT", event);
 }
 
+static void WINAPIV service_ok(int cnd, const char *msg, ...) __WINE_PRINTF_ATTR(2,3);
 static void WINAPIV service_ok(int cnd, const char *msg, ...)
 {
     __ms_va_list valist;
@@ -135,7 +142,7 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPAR
     BOOL r;
     MONITORINFOEXA mi;
 
-    service_ok(hmon != NULL, "Unexpected hmon=%#x\n", hmon);
+    service_ok(hmon != NULL, "Unexpected hmon %p\n", hmon);
 
     monitor_count++;
 




More information about the wine-cvs mailing list