Changeset 64766 in vbox for trunk/src/VBox/Storage

Timestamp:

Nov 30, 2016 10:59:48 AM (8 years ago)

Author:

vboxsync

Message:

src/VBox: Make the use of the iterator for RTListForEach()/RTListForEachSafe() more obvious. There is no need to initialize the iterator and we also must not depend on the iterator being NULL if the list was empty.

Location:

trunk/src/VBox/Storage

Files:

• QCOW.cpp (modified) (6 diffs)
• QED.cpp (modified) (5 diffs)
• VD.cpp (modified) (2 diffs)
• testcase/tstVDIo.cpp (modified) (8 diffs)

trunk/src/VBox/Storage/QCOW.cpp

@@ -475 +475 @@
 static void qcowL2TblCacheDestroy(PQCOWIMAGE pImage)
 {
-    PQCOWL2CACHEENTRY pL2Entry = NULL;
-    PQCOWL2CACHEENTRY pL2Next  = NULL;
-
+    PQCOWL2CACHEENTRY pL2Entry;
+    PQCOWL2CACHEENTRY pL2Next;
     RTListForEachSafe(&pImage->ListSearch, pL2Entry, pL2Next, QCOWL2CACHEENTRY, NodeSearch)
     {
@@ -501 +500 @@
 static PQCOWL2CACHEENTRY qcowL2TblCacheRetain(PQCOWIMAGE pImage, uint64_t offL2Tbl)
 {
-    PQCOWL2CACHEENTRY pL2Entry = NULL;
-
+    PQCOWL2CACHEENTRY pL2Entry;
     RTListForEach(&pImage->ListSearch, pL2Entry, QCOWL2CACHEENTRY, NodeSearch)
     {
@@ -517 +515 @@
         return pL2Entry;
     }
-    else
-        return NULL;
+
+    return NULL;
 }
 
@@ -612 +610 @@
 static void qcowL2TblCacheEntryInsert(PQCOWIMAGE pImage, PQCOWL2CACHEENTRY pL2Entry)
 {
-    PQCOWL2CACHEENTRY pIt = NULL;
-
     Assert(pL2Entry->offL2Tbl > 0);
 
@@ -626 +622 @@
     {
         /* Insert into search list. */
+        PQCOWL2CACHEENTRY pIt;
         pIt = RTListGetFirst(&pImage->ListSearch, QCOWL2CACHEENTRY, NodeSearch);
         if (pIt->offL2Tbl > pL2Entry->offL2Tbl)
@@ -643 +640 @@
                 }
             }
-             Assert(fInserted);
+            Assert(fInserted);
         }
     }

trunk/src/VBox/Storage/QED.cpp

@@ -393 +393 @@
 static void qedL2TblCacheDestroy(PQEDIMAGE pImage)
 {
-    PQEDL2CACHEENTRY pL2Entry = NULL;
-    PQEDL2CACHEENTRY pL2Next  = NULL;
-
+    PQEDL2CACHEENTRY pL2Entry;
+    PQEDL2CACHEENTRY pL2Next;
     RTListForEachSafe(&pImage->ListSearch, pL2Entry, pL2Next, QEDL2CACHEENTRY, NodeSearch)
     {
@@ -419 +418 @@
 static PQEDL2CACHEENTRY qedL2TblCacheRetain(PQEDIMAGE pImage, uint64_t offL2Tbl)
 {
-    PQEDL2CACHEENTRY pL2Entry = NULL;
-
+    PQEDL2CACHEENTRY pL2Entry;
     RTListForEach(&pImage->ListSearch, pL2Entry, QEDL2CACHEENTRY, NodeSearch)
     {
@@ -530 +528 @@
 static void qedL2TblCacheEntryInsert(PQEDIMAGE pImage, PQEDL2CACHEENTRY pL2Entry)
 {
-    PQEDL2CACHEENTRY pIt = NULL;
-
     Assert(pL2Entry->offL2Tbl > 0);
 
@@ -544 +540 @@
     {
         /* Insert into search list. */
+        PQEDL2CACHEENTRY pIt;
         pIt = RTListGetFirst(&pImage->ListSearch, QEDL2CACHEENTRY, NodeSearch);
         if (pIt->offL2Tbl > pL2Entry->offL2Tbl)
@@ -561 +558 @@
                 }
             }
-             Assert(fInserted);
+            Assert(fInserted);
         }
     }

trunk/src/VBox/Storage/VD.cpp

@@ -3602 +3602 @@
 static PVDPLUGIN vdPluginFind(const char *pszFilename)
 {
-    PVDPLUGIN pIt = NULL;
-
+    PVDPLUGIN pIt;
     RTListForEach(&g_ListPluginsLoaded, pIt, VDPLUGIN, NodePlugin)
     {
@@ -5831 +5830 @@
 #ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS
     PVDPLUGIN pPlugin, pPluginNext;
-
     RTListForEachSafe(&g_ListPluginsLoaded, pPlugin, pPluginNext, VDPLUGIN, NodePlugin)
     {

trunk/src/VBox/Storage/testcase/tstVDIo.cpp

@@ -1717 +1717 @@
 
     /* Check for the file. */
-    PVDFILE pIt = NULL;
     bool fFound = false;
+    PVDFILE pIt;
     RTListForEach(&pGlob->ListFiles, pIt, VDFILE, Node)
     {
@@ -1943 +1943 @@
 
     /* Check for the file. */
-    PVDFILE pIt = NULL;
     bool fFound = false;
+    PVDFILE pIt;
     RTListForEach(&pGlob->ListFiles, pIt, VDFILE, Node)
     {
@@ -1976 +1976 @@
 
     /* Check for the file. */
-    PVDFILE pIt = NULL;
     bool fFound = false;
+    PVDFILE pIt;
     RTListForEach(&pGlob->ListFiles, pIt, VDFILE, Node)
     {
@@ -2056 +2056 @@
 
     /* Check if the file exists. */
-    PVDFILE pIt = NULL;
+    PVDFILE pIt;
     RTListForEach(&pGlob->ListFiles, pIt, VDFILE, Node)
     {
@@ -2151 +2151 @@
 
     /* Check if the file exists. */
-    PVDFILE pIt = NULL;
+    PVDFILE pIt;
     RTListForEach(&pGlob->ListFiles, pIt, VDFILE, Node)
     {
@@ -2182 +2182 @@
 
     /* Check if the file exists. */
-    PVDFILE pIt = NULL;
+    PVDFILE pIt;
     RTListForEach(&pGlob->ListFiles, pIt, VDFILE, Node)
     {
@@ -2586 +2586 @@
 static PVDDISK tstVDIoGetDiskByName(PVDTESTGLOB pGlob, const char *pcszDisk)
 {
-    PVDDISK pIt = NULL;
     bool fFound = false;
 
     LogFlowFunc(("pGlob=%#p pcszDisk=%s\n", pGlob, pcszDisk));
 
+    PVDDISK pIt;
     RTListForEach(&pGlob->ListDisks, pIt, VDDISK, ListNode)
     {
@@ -2614 +2614 @@
 static PVDPATTERN tstVDIoGetPatternByName(PVDTESTGLOB pGlob, const char *pcszName)
 {
-    PVDPATTERN pIt = NULL;
     bool fFound = false;
 
     LogFlowFunc(("pGlob=%#p pcszName=%s\n", pGlob, pcszName));
 
+    PVDPATTERN pIt;
     RTListForEach(&pGlob->ListPatterns, pIt, VDPATTERN, ListNode)
     {