[reactos] 21/72: [NTFS] Address some minor issues with attrib.c: Fix gcc build. Fix formatting.

[Trevor Thompson]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed1b4bf9bc62b44408fda6...

commit ed1b4bf9bc62b44408fda66f3cbfb427b2e5cdab
Author: Trevor Thompson [e-mail]
AuthorDate: Sun Jul 17 14:04:01 2016 +0000

[NTFS]
    Address some minor issues with attrib.c: Fix gcc build. Fix formatting.

svn path=/branches/GSoC_2016/NTFS/; revision=71957
---
 drivers/filesystems/ntfs/attrib.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/filesystems/ntfs/attrib.c b/drivers/filesystems/ntfs/attrib.c
index 61d8c8ab8f..e0c41fa0e4 100644
--- a/drivers/filesystems/ntfs/attrib.c
+++ b/drivers/filesystems/ntfs/attrib.c
@@ -89,7 +89,7 @@ AddRun(PNTFS_VCB Vcb,

// Allocate some memory for the RunBuffer
     PUCHAR RunBuffer;
-    int RunBufferOffset = 0;
+    ULONG RunBufferOffset = 0;

if (!AttrContext->Record.IsNonResident)
         return STATUS_INVALID_PARAMETER;
@@ -108,7 +108,7 @@ AddRun(PNTFS_VCB Vcb,
     // Add newly-assigned clusters to mcb
     _SEH2_TRY{
         if (!FsRtlAddLargeMcbEntry(&DataRunsMCB,
-        NextVBN,
+                                   NextVBN,
                                    NextAssignedCluster,
                                    RunLength))
         {
@@ -217,8 +217,6 @@ ConvertDataRunsToLargeMCB(PUCHAR DataRun,
     LONGLONG  DataRunOffset;
     ULONGLONG DataRunLength;
     LONGLONG  DataRunStartLCN;
-    ULONGLONG NextCluster;
-
     ULONGLONG LastLCN = 0;

// Initialize the MCB, potentially catch an exception
@@ -237,8 +235,6 @@ ConvertDataRunsToLargeMCB(PUCHAR DataRun,
             // Normal data run.
             DataRunStartLCN = LastLCN + DataRunOffset;
             LastLCN = DataRunStartLCN;
-            NextCluster = LastLCN + DataRunLength;
-

_SEH2_TRY{
                 if (!FsRtlAddLargeMcbEntry(DataRunsMCB,
@@ -295,14 +291,14 @@ ConvertLargeMCBToDataRuns(PLARGE_MCB DataRunsMCB,
     ULONG RunBufferOffset = 0;
     LONGLONG  DataRunOffset;
     ULONGLONG LastLCN = 0;
-
     LONGLONG Vbn, Lbn, Count;
+    int i;

DPRINT("\t[Vbn, Lbn, Count]\n");

// convert each mcb entry to a data run
-    for (int i = 0; FsRtlGetNextLargeMcbEntry(DataRunsMCB, i, &Vbn, &Lbn, &Count); i++)
+    for (i = 0; FsRtlGetNextLargeMcbEntry(DataRunsMCB, i, &Vbn, &Lbn, &Count); i++)
     {
         UCHAR DataRunOffsetSize = 0;
         UCHAR DataRunLengthSize = 0;