Alexandre Julliard : tests: The ok() macro shouldn't return a value.
Alexandre Julliard
julliard at winehq.org
Wed Feb 24 10:21:35 CST 2010
Module: wine
Branch: master
Commit: 69ee0ad151b4ae14fa017d3f5a284af587d7de01
URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ee0ad151b4ae14fa017d3f5a284af587d7de01
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Feb 24 16:48:07 2010 +0100
tests: The ok() macro shouldn't return a value.
---
include/wine/test.h | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/wine/test.h b/include/wine/test.h
index 5d371c5..e6a7711 100644
--- a/include/wine/test.h
+++ b/include/wine/test.h
@@ -88,21 +88,21 @@ extern void winetest_vskip( const char *msg, va_list ap );
#ifdef __GNUC__
-extern int winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) ));
+extern void winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) ));
extern void winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2)));
extern void winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2)));
extern void winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2)));
#else /* __GNUC__ */
-extern int winetest_ok( int condition, const char *msg, ... );
+extern void winetest_ok( int condition, const char *msg, ... );
extern void winetest_skip( const char *msg, ... );
extern void winetest_win_skip( const char *msg, ... );
extern void winetest_trace( const char *msg, ... );
#endif /* __GNUC__ */
-#define ok_(file, line) (winetest_set_location(file, line), 0) ? 0 : winetest_ok
+#define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok
#define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip
#define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip
#define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace
@@ -330,15 +330,13 @@ int winetest_vok( int condition, const char *msg, va_list args )
}
}
-int winetest_ok( int condition, const char *msg, ... )
+void winetest_ok( int condition, const char *msg, ... )
{
va_list valist;
- int rc;
va_start(valist, msg);
- rc=winetest_vok(condition, msg, valist);
+ winetest_vok(condition, msg, valist);
va_end(valist);
- return rc;
}
void winetest_trace( const char *msg, ... )
More information about the wine-cvs
mailing list