[fireball] 50175: [FASTFAT_NEW] - Don't use same name for a local boolean var and global enum. Spotted by Pierre.

Author: fireball
Date: Mon Dec 27 22:02:11 2010
New Revision: 50175

URL: http://svn.reactos.org/svn/reactos?rev=50175&view=rev
Log:
[FASTFAT_NEW]
- Don't use same name for a local boolean var and global enum. Spotted by Pierre.

Modified:
    trunk/reactos/drivers/filesystems/fastfat_new/create.c

Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfat...
==============================================================================
--- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Mon Dec 27 22:02:11 2010
@@ -493,7 +493,7 @@
     BOOLEAN OpenDirectory;
     BOOLEAN IsPagingFile;
     BOOLEAN OpenTargetDirectory;
-    BOOLEAN DirectoryFile;
+    BOOLEAN IsDirectoryFile;
     BOOLEAN NonDirectoryFile;
     BOOLEAN NoEaKnowledge;
     BOOLEAN DeleteOnClose;
@@ -609,7 +609,7 @@
     Vcb = &((PVOLUME_DEVICE_OBJECT)IrpSp->DeviceObject)->Vcb;

/* Get options */
-    DirectoryFile           = BooleanFlagOn(Options, FILE_DIRECTORY_FILE);
+    IsDirectoryFile         = BooleanFlagOn(Options, FILE_DIRECTORY_FILE);
     NonDirectoryFile        = BooleanFlagOn(Options, FILE_NON_DIRECTORY_FILE);
     SequentialOnly          = BooleanFlagOn(Options, FILE_SEQUENTIAL_ONLY);
     NoIntermediateBuffering = BooleanFlagOn(Options, FILE_NO_INTERMEDIATE_BUFFERING);
@@ -624,17 +624,17 @@
     CreateDisposition = (Options >> 24) & 0x000000ff;

/* Get Create/Open directory flags based on it */
-    CreateDirectory = (BOOLEAN)(DirectoryFile &&
+    CreateDirectory = (BOOLEAN)(IsDirectoryFile &&
                                 ((CreateDisposition == FILE_CREATE) ||
                                  (CreateDisposition == FILE_OPEN_IF)));

-    OpenDirectory   = (BOOLEAN)(DirectoryFile &&
+    OpenDirectory   = (BOOLEAN)(IsDirectoryFile &&
                                 ((CreateDisposition == FILE_OPEN) ||
                                  (CreateDisposition == FILE_OPEN_IF)));

/* Validate parameters: directory/nondirectory mismatch and
        AllocationSize being more than 4GB */
-    if ((DirectoryFile && NonDirectoryFile) ||
+    if ((IsDirectoryFile && NonDirectoryFile) ||
         Irp->Overlay.AllocationSize.HighPart != 0)
     {
         FatCompleteRequest(IrpContext, Irp, STATUS_INVALID_PARAMETER);
@@ -686,9 +686,9 @@
             FatDecodeFileObject(RelatedFO, &DecodedVcb, &Fcb, &Ccb) == UserVolumeOpen)
         {
             /* Check parameters */
-            if (DirectoryFile || OpenTargetDirectory)
-            {
-                Status = DirectoryFile ? STATUS_NOT_A_DIRECTORY : STATUS_INVALID_PARAMETER;
+            if (IsDirectoryFile || OpenTargetDirectory)
+            {
+                Status = IsDirectoryFile ? STATUS_NOT_A_DIRECTORY : STATUS_INVALID_PARAMETER;

/* Unlock VCB */
                 FatReleaseVcb(IrpContext, Vcb);