[PATCH] kernel32: Avoid shadowing "ret" variable

Marcus Meissner meissner at suse.de
Fri Oct 21 01:18:21 CDT 2011


Hi,

ret is used twice, with different types. Use a new
variable "res".

Ciao, Marcus
---
 dlls/kernel32/console.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c
index cf44bf2..481becd 100644
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@@ -1460,16 +1460,16 @@ static  BOOL    start_console_renderer_helper(const char* appname, STARTUPINFOA*
                        NULL, NULL, si, &pi))
     {
         HANDLE  wh[2];
-        DWORD   ret;
+        DWORD   res;
 
         wh[0] = hEvent;
         wh[1] = pi.hProcess;
-        ret = WaitForMultipleObjects(2, wh, FALSE, INFINITE);
+        res = WaitForMultipleObjects(2, wh, FALSE, INFINITE);
 
         CloseHandle(pi.hThread);
         CloseHandle(pi.hProcess);
 
-        if (ret != WAIT_OBJECT_0) return FALSE;
+        if (res != WAIT_OBJECT_0) return FALSE;
 
         TRACE("Started wineconsole pid=%08x tid=%08x\n",
               pi.dwProcessId, pi.dwThreadId);
-- 
1.7.1




More information about the wine-patches mailing list