Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-19 00:54:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FASTFAT_NEW]

Browse source 
- Don't use same name for a local boolean var and global enum. Spotted by Pierre.

svn path=/trunk/; revision=50175
This commit is contained in:
Aleksey Bragin 2010-12-27 22:02:11 +00:00
parent 9670bc63c4
commit 18910c84c6
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/drivers/filesystems/fastfat_new/create.c
View file

@ -493,7 +493,7 @@ FatiCreate(IN PFAT_IRP_CONTEXT IrpContext,
BOOLEAN OpenDirectory; BOOLEAN OpenDirectory;
BOOLEAN IsPagingFile; BOOLEAN IsPagingFile;
BOOLEAN OpenTargetDirectory; BOOLEAN OpenTargetDirectory;
BOOLEAN DirectoryFile; BOOLEAN IsDirectoryFile;
BOOLEAN NonDirectoryFile; BOOLEAN NonDirectoryFile;
BOOLEAN NoEaKnowledge; BOOLEAN NoEaKnowledge;
BOOLEAN DeleteOnClose; BOOLEAN DeleteOnClose;
@ -609,7 +609,7 @@ FatiCreate(IN PFAT_IRP_CONTEXT IrpContext,
Vcb = &((PVOLUME_DEVICE_OBJECT)IrpSp->DeviceObject)->Vcb; Vcb = &((PVOLUME_DEVICE_OBJECT)IrpSp->DeviceObject)->Vcb;
/* Get options */ /* Get options */
DirectoryFile = BooleanFlagOn(Options, FILE_DIRECTORY_FILE); IsDirectoryFile = BooleanFlagOn(Options, FILE_DIRECTORY_FILE);
NonDirectoryFile = BooleanFlagOn(Options, FILE_NON_DIRECTORY_FILE); NonDirectoryFile = BooleanFlagOn(Options, FILE_NON_DIRECTORY_FILE);
SequentialOnly = BooleanFlagOn(Options, FILE_SEQUENTIAL_ONLY); SequentialOnly = BooleanFlagOn(Options, FILE_SEQUENTIAL_ONLY);
NoIntermediateBuffering = BooleanFlagOn(Options, FILE_NO_INTERMEDIATE_BUFFERING); NoIntermediateBuffering = BooleanFlagOn(Options, FILE_NO_INTERMEDIATE_BUFFERING);
@ -624,17 +624,17 @@ FatiCreate(IN PFAT_IRP_CONTEXT IrpContext,
CreateDisposition = (Options >> 24) & 0x000000ff; CreateDisposition = (Options >> 24) & 0x000000ff;
/* Get Create/Open directory flags based on it */ /* Get Create/Open directory flags based on it */
CreateDirectory = (BOOLEAN)(DirectoryFile && CreateDirectory = (BOOLEAN)(IsDirectoryFile &&
((CreateDisposition == FILE_CREATE) || ((CreateDisposition == FILE_CREATE) ||
(CreateDisposition == FILE_OPEN_IF))); (CreateDisposition == FILE_OPEN_IF)));
OpenDirectory = (BOOLEAN)(DirectoryFile && OpenDirectory = (BOOLEAN)(IsDirectoryFile &&
((CreateDisposition == FILE_OPEN) || ((CreateDisposition == FILE_OPEN) ||
(CreateDisposition == FILE_OPEN_IF))); (CreateDisposition == FILE_OPEN_IF)));
/* Validate parameters: directory/nondirectory mismatch and /* Validate parameters: directory/nondirectory mismatch and
AllocationSize being more than 4GB */ AllocationSize being more than 4GB */
if ((DirectoryFile && NonDirectoryFile) || if ((IsDirectoryFile && NonDirectoryFile) ||
Irp->Overlay.AllocationSize.HighPart != 0) Irp->Overlay.AllocationSize.HighPart != 0)
{ {
FatCompleteRequest(IrpContext, Irp, STATUS_INVALID_PARAMETER); FatCompleteRequest(IrpContext, Irp, STATUS_INVALID_PARAMETER);
@ -686,9 +686,9 @@ FatiCreate(IN PFAT_IRP_CONTEXT IrpContext,
FatDecodeFileObject(RelatedFO, &DecodedVcb, &Fcb, &Ccb) == UserVolumeOpen) FatDecodeFileObject(RelatedFO, &DecodedVcb, &Fcb, &Ccb) == UserVolumeOpen)
{ {
/* Check parameters */ /* Check parameters */
if (DirectoryFile || OpenTargetDirectory) if (IsDirectoryFile || OpenTargetDirectory)
{ {
Status = DirectoryFile ? STATUS_NOT_A_DIRECTORY : STATUS_INVALID_PARAMETER; Status = IsDirectoryFile ? STATUS_NOT_A_DIRECTORY : STATUS_INVALID_PARAMETER;
/* Unlock VCB */ /* Unlock VCB */
FatReleaseVcb(IrpContext, Vcb); FatReleaseVcb(IrpContext, Vcb);