ntdll: avoid shadowing a parameter

Austin English austinenglish at gmail.com
Wed Mar 9 03:08:04 CST 2011


-- 
-Austin
-------------- next part --------------
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index 0913b71..da1f405 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -1238,12 +1238,12 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz
             if (imports && imports->VirtualAddress >= sec->VirtualAddress &&
                 imports->VirtualAddress < sec->VirtualAddress + map_size)
             {
-                UINT_PTR base = imports->VirtualAddress & ~page_mask;
-                UINT_PTR end = base + ROUND_SIZE( imports->VirtualAddress, imports->Size );
+                UINT_PTR base_address = imports->VirtualAddress & ~page_mask;
+                UINT_PTR end = base_address + ROUND_SIZE( imports->VirtualAddress, imports->Size );
                 if (end > sec->VirtualAddress + map_size) end = sec->VirtualAddress + map_size;
-                if (end > base)
-                    map_file_into_view( view, shared_fd, base, end - base,
-                                        pos + (base - sec->VirtualAddress),
+                if (end > base_address)
+                    map_file_into_view( view, shared_fd, base_address, end - base_address,
+                                        pos + (base_address - sec->VirtualAddress),
                                         VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY,
                                         FALSE );
             }


More information about the wine-patches mailing list