[PATCH v4 3/5] ntdll: Rename key variable and file parameter.

[Santino Mazza]

From: Santino Mazza

---
 dlls/ntdll/unix/registry.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c
index 797e32a5bf1..f61b892875f 100644
--- a/dlls/ntdll/unix/registry.c
+++ b/dlls/ntdll/unix/registry.c
@@ -696,18 +696,18 @@ NTSTATUS WINAPI NtLoadKey2( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fi
 /******************************************************************************
  *              NtLoadKeyEx  (NTDLL.@)
  */
-NTSTATUS WINAPI NtLoadKeyEx( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *file, ULONG flags, HANDLE trustkey,
+NTSTATUS WINAPI NtLoadKeyEx( const OBJECT_ATTRIBUTES *key_attr, OBJECT_ATTRIBUTES *file_attr, ULONG flags, HANDLE trustkey,
                              HANDLE event, ACCESS_MASK access, HANDLE *roothandle, IO_STATUS_BLOCK *iostatus )
 {
     NTSTATUS ret;
-    HANDLE key;
+    HANDLE file;
     data_size_t len;
     struct object_attributes *objattr;
     char *unix_name;
     UNICODE_STRING nt_name;
-    OBJECT_ATTRIBUTES new_attr = *file;
+    OBJECT_ATTRIBUTES new_attr = *file_attr;

-    TRACE( "(%p,%p,0x%x,%p,%p,0x%x,%p,%p)\n", attr, file, flags, trustkey, event, access, roothandle, iostatus );
+    TRACE( "(%p,%p,0x%x,%p,%p,0x%x,%p,%p)\n", key_attr, file_attr, flags, trustkey, event, access, roothandle, iostatus );

if (flags) FIXME( "flags %x not handled\n", flags );
     if (trustkey) FIXME("trustkey parameter not supported\n");
@@ -719,7 +719,7 @@ NTSTATUS WINAPI NtLoadKeyEx( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *f
     get_redirect( &new_attr, &nt_name );
     if (!(ret = nt_to_unix_file_name( &new_attr, &unix_name, FILE_OPEN )))
     {
-        ret = open_unix_file( &key, unix_name, GENERIC_READ | SYNCHRONIZE,
+        ret = open_unix_file( &file, unix_name, GENERIC_READ | SYNCHRONIZE,
                               &new_attr, 0, 0, FILE_OPEN, 0, NULL, 0 );
         free( unix_name );
     }
@@ -727,19 +727,19 @@ NTSTATUS WINAPI NtLoadKeyEx( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *f

if (ret) return ret;

-    if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret;
+    if ((ret = alloc_object_attributes( key_attr, &objattr, &len ))) return ret;
     objattr->attributes |= OBJ_OPENIF | OBJ_CASE_INSENSITIVE;

SERVER_START_REQ( load_registry )
     {
-        req->file = wine_server_obj_handle( key );
+        req->file = wine_server_obj_handle( file );
         wine_server_add_data( req, objattr, len );
         ret = wine_server_call( req );
         if (ret == STATUS_OBJECT_NAME_EXISTS) ret = STATUS_SUCCESS;
     }
     SERVER_END_REQ;

-    NtClose( key );
+    NtClose( file );
     free( objattr );
     return ret;
 }