From d189ed6fddda6e444ba87342a30ceb34510f7625 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 2 Dec 2009 17:38:05 +0100 Subject: [PATCH] ntdll: Remove an unnecessary NULL pointer check. --- dlls/ntdll/file.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 213d083b886..56c26c21ffc 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -142,20 +142,16 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT if (io->u.Status == STATUS_SUCCESS) { - struct security_descriptor *sd = NULL; + struct security_descriptor *sd; struct object_attributes objattr; objattr.rootdir = wine_server_obj_handle( attr->RootDirectory ); - objattr.sd_len = 0; objattr.name_len = 0; - if (attr) + io->u.Status = NTDLL_create_struct_sd( attr->SecurityDescriptor, &sd, &objattr.sd_len ); + if (io->u.Status != STATUS_SUCCESS) { - io->u.Status = NTDLL_create_struct_sd( attr->SecurityDescriptor, &sd, &objattr.sd_len ); - if (io->u.Status != STATUS_SUCCESS) - { - RtlFreeAnsiString( &unix_name ); - return io->u.Status; - } + RtlFreeAnsiString( &unix_name ); + return io->u.Status; } SERVER_START_REQ( create_file ) -- 2.11.4.GIT