Detlef Riekenberg : ntdll: attr is never NULL inside NtCreateFile.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ace8fd7298399d6437a4e6eca45797d22a44ffe5
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=ace8fd7298399d6437a4e6ec...

Author: Detlef Riekenberg <wine.dev(a)web.de>
Date:   Fri Sep  8 00:20:28 2006 +0200

ntdll: attr is never NULL inside NtCreateFile.

---

 dlls/ntdll/file.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index e6257f9..dc8a6bc 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -159,8 +159,8 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE ha
         SERVER_START_REQ( open_named_pipe )
         {
             req->access = access;
-            req->attributes = (attr) ? attr->Attributes : 0;
-            req->rootdir = attr ? attr->RootDirectory : 0;
+            req->attributes = attr->Attributes;
+            req->rootdir = attr->RootDirectory;
             req->flags = options;
             wine_server_add_data( req, attr->ObjectName->Buffer,
                                   attr->ObjectName->Length );
@@ -179,8 +179,8 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE ha
         SERVER_START_REQ( open_mailslot )
         {
             req->access = access & GENERIC_WRITE;
-            req->attributes = (attr) ? attr->Attributes : 0;
-            req->rootdir = attr ? attr->RootDirectory : 0;
+            req->attributes = attr->Attributes;
+            req->rootdir = attr->RootDirectory;
             req->sharing = sharing;
             wine_server_add_data( req, attr->ObjectName->Buffer,
                                   attr->ObjectName->Length );