Changeset 69845 in vbox

Timestamp:

Nov 27, 2017 3:49:27 PM (7 years ago)

Author:

vboxsync

Message:

ext2vfs.cpp: style cleanups

File:

• trunk/src/VBox/Runtime/common/fs/ext2vfs.cpp (modified) (10 diffs)

trunk/src/VBox/Runtime/common/fs/ext2vfs.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT Filesystem API (FileSys) - ext2/3 format.
+ * IPRT - Ext2/3/4 Virtual Filesystem.
  */
 
@@ -92 +92 @@
 static int rtFsExtLoadBlkGrpDesc(PRTFILESYSTEMEXT pThis, uint32_t iBlkGrp)
 {
-    int rc = VINF_SUCCESS;
-    PRTFILESYSTEMEXTBLKGRP pBlkGrpDesc = pThis->pBlkGrpDesc;
-    uint64_t offRead = (pThis->iSbBlock + 1) * pThis->cbBlock;
-    EXT2BLOCKGROUPDESC BlkDesc;
-    size_t cbBlockBitmap;
-
-    cbBlockBitmap = pThis->cBlocksPerGroup / 8;
+    size_t cbBlockBitmap = pThis->cBlocksPerGroup / 8;
     if (pThis->cBlocksPerGroup % 8)
         cbBlockBitmap++;
 
+    PRTFILESYSTEMEXTBLKGRP pBlkGrpDesc = pThis->pBlkGrpDesc;
     if (!pBlkGrpDesc)
     {
@@ -110 +105 @@
     }
 
-    rc = RTVfsFileReadAt(pThis->hVfsFile, offRead, &BlkDesc, sizeof(BlkDesc), NULL);
+    uint64_t            offRead = (pThis->iSbBlock + 1) * pThis->cbBlock;
+    EXT2BLOCKGROUPDESC  BlkDesc;
+    int rc = RTVfsFileReadAt(pThis->hVfsFile, offRead, &BlkDesc, sizeof(BlkDesc), NULL);
     if (RT_SUCCESS(rc))
     {
@@ -120 +117 @@
 
     pThis->pBlkGrpDesc = pBlkGrpDesc;
-
     return rc;
 }
 
+
 static bool rtFsExtIsBlockRangeInUse(PRTFILESYSTEMEXTBLKGRP pBlkGrpDesc, uint32_t offBlockStart, size_t cBlocks)
 {
-    bool fUsed = false;
-
     while (cBlocks)
     {
@@ -134 +129 @@
 
         if (pBlkGrpDesc->abBlockBitmap[idxByte] & RT_BIT(iBit))
-        {
-            fUsed = true;
-            break;
-        }
+            return true;
 
         cBlocks--;
@@ -143 +135 @@
     }
 
-    return fUsed;
+    return false;
 }
 
@@ -187 +179 @@
 static DECLCALLBACK(int) rtFsExt2_QueryRangeState(void *pvThis, uint64_t off, size_t cb, bool *pfUsed)
 {
-    int rc = VINF_SUCCESS;
-    uint64_t offStart = (uint64_t)off;
-    PRTFILESYSTEMEXT pThis = (PRTFILESYSTEMEXT)pvThis;
+    int                 rc    = VINF_SUCCESS;
+    PRTFILESYSTEMEXT    pThis = (PRTFILESYSTEMEXT)pvThis;
 
     *pfUsed = false;
@@ -195 +186 @@
     while (cb > 0)
     {
-        bool fUsed;
-        uint32_t offBlockStart = (uint32_t)(offStart / pThis->cbBlock);
-        uint32_t iBlockGroup = (offBlockStart - pThis->iSbBlock) / pThis->cBlocksPerGroup;
-        uint32_t offBlockRelStart = offBlockStart - iBlockGroup * pThis->cBlocksPerGroup;
-        size_t cbThis = 0;
-
-        if (   offStart < pThis->pBlkGrpDesc->offStart
-            || offStart > pThis->pBlkGrpDesc->offLast)
+        uint32_t const offBlockStart    = (uint32_t)(off / pThis->cbBlock);
+        uint32_t const iBlockGroup      = (offBlockStart - pThis->iSbBlock) / pThis->cBlocksPerGroup;
+        uint32_t const offBlockRelStart = offBlockStart - iBlockGroup * pThis->cBlocksPerGroup;
+
+        if (   off < pThis->pBlkGrpDesc->offStart
+            || off > pThis->pBlkGrpDesc->offLast)
         {
             /* Load new block descriptor. */
@@ -210 +199 @@
         }
 
-        cbThis = RT_MIN(cb, pThis->pBlkGrpDesc->offLast - offStart + 1);
-        fUsed = rtFsExtIsBlockRangeInUse(pThis->pBlkGrpDesc, offBlockRelStart,
-                                         cbThis / pThis->cbBlock +
-                                         (cbThis % pThis->cbBlock ? 1 : 0));
-
-        if (fUsed)
+        size_t cbThis = RT_MIN(cb, pThis->pBlkGrpDesc->offLast - off + 1);
+        if (rtFsExtIsBlockRangeInUse(pThis->pBlkGrpDesc,
+                                     offBlockRelStart,
+                                     cbThis / pThis->cbBlock + (cbThis % pThis->cbBlock ? 1 : 0)) )
         {
             *pfUsed = true;
@@ -221 +208 @@
         }
 
-        cb       -= cbThis;
-        offStart += cbThis;
+        cb  -= cbThis;
+        off += cbThis;
     }