wininet: Avoid compiler warnings due to negation before binary operator. (RESEND)
Gerald Pfeifer
gerald at pfeifer.com
Sun Sep 7 06:25:20 CDT 2014
As of last week, what will become GCC 5.0 does warn about this as
part of -Wall.
There are a couple of cases in Wine, such as this, which I'd like
to address.
Gerald
---
dlls/wininet/tests/urlcache.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c
index f735d73..5ee45c9 100644
--- a/dlls/wininet/tests/urlcache.c
+++ b/dlls/wininet/tests/urlcache.c
@@ -218,16 +218,16 @@ static void test_IsUrlCacheEntryExpiredA(void)
* is NULL.
*/
ret = IsUrlCacheEntryExpiredA(NULL, 0, NULL);
- ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret);
+ ok((!ret) == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret);
ft.dwLowDateTime = 0xdeadbeef;
ft.dwHighDateTime = 0xbaadf00d;
ret = IsUrlCacheEntryExpiredA(NULL, 0, &ft);
- ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret);
+ ok((!ret) == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret);
ok(ft.dwLowDateTime == 0xdeadbeef && ft.dwHighDateTime == 0xbaadf00d,
"expected time to be unchanged, got (%u,%u)\n",
ft.dwLowDateTime, ft.dwHighDateTime);
ret = IsUrlCacheEntryExpiredA(test_url, 0, NULL);
- ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret);
+ ok((!ret) == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret);
/* The return value should indicate whether the URL is expired,
* and the filetime indicates the last modified time, but a cache entry
@@ -310,7 +310,7 @@ static void test_IsUrlCacheEntryExpiredA(void)
ft.dwLowDateTime = 0xdeadbeef;
ft.dwHighDateTime = 0xbaadf00d;
ret = IsUrlCacheEntryExpiredA(uncached_url, 0, &ft);
- ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret);
+ ok((!ret) == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret);
ok(!ft.dwLowDateTime && !ft.dwHighDateTime,
"expected time (0,0), got (%u,%u)\n",
ft.dwLowDateTime, ft.dwHighDateTime);
--
2.0.2
More information about the wine-patches
mailing list