Alexandre Julliard : shell32/tests: Don' t use the return value of the ok macro.
Alexandre Julliard
julliard at winehq.org
Wed Feb 24 10:21:35 CST 2010
Module: wine
Branch: master
Commit: d279227538a32130c437ba8523f7c928e1b1d109
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d279227538a32130c437ba8523f7c928e1b1d109
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Feb 24 16:03:15 2010 +0100
shell32/tests: Don't use the return value of the ok macro.
---
dlls/shell32/tests/shlexec.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c
index c673f0a..5d5db34 100644
--- a/dlls/shell32/tests/shlexec.c
+++ b/dlls/shell32/tests/shlexec.c
@@ -672,28 +672,28 @@ static int StrCmpPath(const char* s1, const char* s2)
return 0;
}
-static int _okChildString(const char* file, int line, const char* key, const char* expected)
+static void _okChildString(const char* file, int line, const char* key, const char* expected)
{
char* result;
result=getChildString("Arguments", key);
- return ok_(file, line)(lstrcmpiA(result, expected) == 0,
- "%s expected '%s', got '%s'\n", key, expected, result);
+ ok_(file, line)(lstrcmpiA(result, expected) == 0,
+ "%s expected '%s', got '%s'\n", key, expected, result);
}
-static int _okChildPath(const char* file, int line, const char* key, const char* expected)
+static void _okChildPath(const char* file, int line, const char* key, const char* expected)
{
char* result;
result=getChildString("Arguments", key);
- return ok_(file, line)(StrCmpPath(result, expected) == 0,
- "%s expected '%s', got '%s'\n", key, expected, result);
+ ok_(file, line)(StrCmpPath(result, expected) == 0,
+ "%s expected '%s', got '%s'\n", key, expected, result);
}
-static int _okChildInt(const char* file, int line, const char* key, int expected)
+static void _okChildInt(const char* file, int line, const char* key, int expected)
{
INT result;
result=GetPrivateProfileIntA("Arguments", key, expected, child_file);
- return ok_(file, line)(result == expected,
- "%s expected %d, but got %d\n", key, expected, result);
+ ok_(file, line)(result == expected,
+ "%s expected %d, but got %d\n", key, expected, result);
}
#define okChildString(key, expected) _okChildString(__FILE__, __LINE__, (key), (expected))
More information about the wine-cvs
mailing list