From 34b85a88a2bec56ee4bcf9a116ec52c6d9216f55 Mon Sep 17 00:00:00 2001 From: "KJK::Hyperion" Date: Sat, 24 Aug 2002 03:50:49 +0000 Subject: [PATCH] Removed superfluous DPRINTs svn path=/trunk/; revision=3386 --- reactos/lib/kernel32/file/create.c | 77 ++++++++---------------------- 1 file changed, 19 insertions(+), 58 deletions(-) diff --git a/reactos/lib/kernel32/file/create.c b/reactos/lib/kernel32/file/create.c index df3a14a9415..23e31a536bd 100644 --- a/reactos/lib/kernel32/file/create.c +++ b/reactos/lib/kernel32/file/create.c @@ -1,4 +1,4 @@ -/* $Id: create.c,v 1.26 2002/08/18 16:01:11 hyperion Exp $ +/* $Id: create.c,v 1.27 2002/08/24 03:50:49 hyperion Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -10,6 +10,7 @@ * Created 01/11/98 * Removed use of SearchPath (not used by Windows) * 18/08/2002: CreateFileW mess cleaned up (KJK::Hyperion) + * 24/08/2002: removed superfluous DPRINTs (KJK::Hyperion) */ /* INCLUDES *****************************************************************/ @@ -99,38 +100,30 @@ HANDLE STDCALL CreateFileW (LPCWSTR lpFileName, switch (dwCreationDisposition) { case CREATE_NEW: - DPRINT("Creation disposition is CREATE_NEW\n"); dwCreationDisposition = FILE_CREATE; break; case CREATE_ALWAYS: - DPRINT("Creation disposition is CREATE_ALWAYS\n"); dwCreationDisposition = FILE_OVERWRITE_IF; break; case OPEN_EXISTING: - DPRINT("Creation disposition is OPEN_EXISTING\n"); dwCreationDisposition = FILE_OPEN; break; case OPEN_ALWAYS: - DPRINT("Creation disposition is OPEN_ALWAYS\n"); dwCreationDisposition = FILE_OPEN_IF; break; case TRUNCATE_EXISTING: - DPRINT("Creation disposition is TRUNCATE_EXISTING\n"); dwCreationDisposition = FILE_OVERWRITE; break; default: - DPRINT("Invalid creation disposition\n"); SetLastError(ERROR_INVALID_PARAMETER); return (INVALID_HANDLE_VALUE); } -#define DO_AND_DPRINT(__EXPR__) __EXPR__; DPRINT(#__EXPR__ "\n"); - /* validate & translate the flags */ if (dwFlagsAndAttributes & FILE_FLAG_OVERLAPPED) { @@ -139,9 +132,7 @@ HANDLE STDCALL CreateFileW (LPCWSTR lpFileName, return INVALID_HANDLE_VALUE; } else - { - DO_AND_DPRINT(Flags |= FILE_SYNCHRONOUS_IO_ALERT) - } + Flags |= FILE_SYNCHRONOUS_IO_ALERT; /* validate & translate the filename */ if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpFileName, @@ -158,53 +149,35 @@ HANDLE STDCALL CreateFileW (LPCWSTR lpFileName, /* translate the flags that need no validation */ if(dwFlagsAndAttributes & FILE_FLAG_WRITE_THROUGH) - { - DO_AND_DPRINT(Flags |= FILE_WRITE_THROUGH) - } + Flags |= FILE_WRITE_THROUGH; if(dwFlagsAndAttributes & FILE_FLAG_NO_BUFFERING) - { - DO_AND_DPRINT(Flags |= FILE_NO_INTERMEDIATE_BUFFERING) - } + Flags |= FILE_NO_INTERMEDIATE_BUFFERING; if(dwFlagsAndAttributes & FILE_FLAG_RANDOM_ACCESS) - { - DO_AND_DPRINT(Flags |= FILE_RANDOM_ACCESS) - } + Flags |= FILE_RANDOM_ACCESS; if(dwFlagsAndAttributes & FILE_FLAG_SEQUENTIAL_SCAN) - { - DO_AND_DPRINT(Flags |= FILE_SEQUENTIAL_ONLY) - } + Flags |= FILE_SEQUENTIAL_ONLY; if(dwFlagsAndAttributes & FILE_FLAG_DELETE_ON_CLOSE) - { - DO_AND_DPRINT(Flags |= FILE_DELETE_ON_CLOSE) - } + Flags |= FILE_DELETE_ON_CLOSE; if(dwFlagsAndAttributes & FILE_FLAG_BACKUP_SEMANTICS) { if(dwDesiredAccess & GENERIC_ALL) - { - DO_AND_DPRINT(Flags |= FILE_OPEN_FOR_BACKUP_INTENT | FILE_OPEN_FOR_RECOVERY) - } + Flags |= FILE_OPEN_FOR_BACKUP_INTENT | FILE_OPEN_FOR_RECOVERY; else { if(dwDesiredAccess & GENERIC_READ) - { - DO_AND_DPRINT(Flags |= FILE_OPEN_FOR_BACKUP_INTENT) - } + Flags |= FILE_OPEN_FOR_BACKUP_INTENT; if(dwDesiredAccess & GENERIC_WRITE) - { - DO_AND_DPRINT(Flags |= FILE_OPEN_FOR_RECOVERY) - } + Flags |= FILE_OPEN_FOR_RECOVERY; } } else - { - DO_AND_DPRINT(Flags |= FILE_NON_DIRECTORY_FILE) - } + Flags |= FILE_NON_DIRECTORY_FILE; /* FILE_FLAG_POSIX_SEMANTICS is handled later */ @@ -219,25 +192,17 @@ HANDLE STDCALL CreateFileW (LPCWSTR lpFileName, /* translate the desired access */ if (dwDesiredAccess & GENERIC_ALL) - { - DO_AND_DPRINT(dwDesiredAccess |= FILE_ALL_ACCESS) - } + dwDesiredAccess |= FILE_ALL_ACCESS; else { if (dwDesiredAccess & GENERIC_READ) - { - DO_AND_DPRINT(dwDesiredAccess |= FILE_GENERIC_READ); - } + dwDesiredAccess |= FILE_GENERIC_READ; if (dwDesiredAccess & GENERIC_WRITE) - { - DO_AND_DPRINT(dwDesiredAccess |= FILE_GENERIC_WRITE); - } + dwDesiredAccess |= FILE_GENERIC_WRITE; if (dwDesiredAccess & GENERIC_EXECUTE) - { - DO_AND_DPRINT(dwDesiredAccess |= FILE_GENERIC_EXECUTE); - } + dwDesiredAccess |= FILE_GENERIC_EXECUTE; } /* build the object attributes */ @@ -252,17 +217,13 @@ HANDLE STDCALL CreateFileW (LPCWSTR lpFileName, if (lpSecurityAttributes) { if(lpSecurityAttributes->bInheritHandle) - { - DO_AND_DPRINT(ObjectAttributes.Attributes |= OBJ_INHERIT) - } + ObjectAttributes.Attributes |= OBJ_INHERIT; - DO_AND_DPRINT(ObjectAttributes.SecurityDescriptor = lpSecurityAttributes->lpSecurityDescriptor) + ObjectAttributes.SecurityDescriptor = lpSecurityAttributes->lpSecurityDescriptor; } if(!(dwFlagsAndAttributes & FILE_FLAG_POSIX_SEMANTICS)) - { - DO_AND_DPRINT(ObjectAttributes.Attributes |= OBJ_CASE_INSENSITIVE) - } + ObjectAttributes.Attributes |= OBJ_CASE_INSENSITIVE; /* perform the call */ Status = NtCreateFile (&FileHandle,