Michael Stefaniuc : advapi32/tests: Don't shadow some local variables.
Alexandre Julliard
julliard at winehq.org
Fri Aug 17 10:37:47 CDT 2012
Module: wine
Branch: master
Commit: ccc4c35a7afbf11508f3ccc883fbb8e49c5927e0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc4c35a7afbf11508f3ccc883fbb8e49c5927e0
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Fri Aug 17 16:22:01 2012 +0200
advapi32/tests: Don't shadow some local variables.
---
dlls/advapi32/tests/security.c | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 291c99d..ba0750b 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -65,7 +65,7 @@ typedef struct _OBJECT_BASIC_INFORMATION {
LARGE_INTEGER CreateTime;
} OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION;
-#define expect_eq(expr, value, type, format) { type ret = expr; ok((value) == ret, #expr " expected " format " got " format "\n", (value), (ret)); }
+#define expect_eq(expr, value, type, format) { type ret_ = expr; ok((value) == ret_, #expr " expected " format " got " format "\n", (value), (ret_)); }
static BOOL (WINAPI *pAddAccessAllowedAceEx)(PACL, DWORD, DWORD, DWORD, PSID);
static BOOL (WINAPI *pAddAccessDeniedAceEx)(PACL, DWORD, DWORD, DWORD, PSID);
@@ -254,8 +254,6 @@ static void test_sid(void)
for( i = 0; i < sizeof(refs) / sizeof(refs[0]); i++ )
{
- PISID pisid;
-
r = AllocateAndInitializeSid( &refs[i].auth, 1,1,0,0,0,0,0,0,0,
&psid );
ok( r, "failed to allocate sid\n" );
@@ -2431,15 +2429,15 @@ static void test_granted_access(HANDLE handle, ACCESS_MASK access,
#define CHECK_SET_SECURITY(o,i,e) \
do{ \
- BOOL res; \
+ BOOL res_; \
DWORD err; \
SetLastError( 0xdeadbeef ); \
- res = SetKernelObjectSecurity( o, i, SecurityDescriptor ); \
+ res_ = SetKernelObjectSecurity( o, i, SecurityDescriptor ); \
err = GetLastError(); \
if (e == ERROR_SUCCESS) \
- ok(res, "SetKernelObjectSecurity failed with %d\n", err); \
+ ok(res_, "SetKernelObjectSecurity failed with %d\n", err); \
else \
- ok(!res && err == e, "SetKernelObjectSecurity should have failed " \
+ ok(!res_ && err == e, "SetKernelObjectSecurity should have failed " \
"with %s, instead of %d\n", #e, err); \
}while(0)
More information about the wine-cvs
mailing list