Alexandre Julliard : ntdll: Remove an unnecessary NULL pointer check.
Alexandre Julliard
julliard at winehq.org
Thu Dec 3 10:29:49 CST 2009
Module: wine
Branch: master
Commit: d189ed6fddda6e444ba87342a30ceb34510f7625
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d189ed6fddda6e444ba87342a30ceb34510f7625
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Dec 2 17:38:05 2009 +0100
ntdll: Remove an unnecessary NULL pointer check.
---
dlls/ntdll/file.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 213d083..56c26c2 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 )
More information about the wine-cvs
mailing list