Changeset 64766 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

112111

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/Additions/common/VBoxService

Files:

• VBoxServiceControlProcess.cpp (modified) (1 diff)
• VBoxServicePropCache.cpp (modified) (4 diffs)
• VBoxServiceToolBox.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp

@@ -1152 +1152 @@
         /* Search old threads using the desired PID and shut them down completely -- it's
          * not used anymore. */
-        PVBOXSERVICECTRLPROCESS pProcessCur;
         bool fTryAgain;
         do
         {
             fTryAgain = false;
+            PVBOXSERVICECTRLPROCESS pProcessCur;
             RTListForEach(&pProcess->pSession->lstProcesses, pProcessCur, VBOXSERVICECTRLPROCESS, Node)
             {

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp

@@ -45 +45 @@
      *        implementation (AVL tree). However, this is not important at the
      *        moment. */
-    PVBOXSERVICEVEPROPCACHEENTRY pNodeIt, pNode = NULL;
+    PVBOXSERVICEVEPROPCACHEENTRY pNode = NULL;
     if (RT_SUCCESS(RTCritSectEnter(&pCache->CritSect)))
     {
+        PVBOXSERVICEVEPROPCACHEENTRY pNodeIt;
         RTListForEach(&pCache->NodeHead, pNodeIt, VBOXSERVICEVEPROPCACHEENTRY, NodeSucc)
         {
@@ -323 +324 @@
 
     int rc = VERR_NOT_FOUND;
-    PVBOXSERVICEVEPROPCACHEENTRY pNodeIt = NULL;
     if (RT_SUCCESS(RTCritSectEnter(&pCache->CritSect)))
     {
@@ -341 +341 @@
         {
             /* Iterate through all nodes and compare their paths. */
+            PVBOXSERVICEVEPROPCACHEENTRY pNodeIt;
             RTListForEach(&pCache->NodeHead, pNodeIt, VBOXSERVICEVEPROPCACHEENTRY, NodeSucc)
             {
@@ -369 +370 @@
 
     int rc = VINF_SUCCESS;
-    PVBOXSERVICEVEPROPCACHEENTRY pNodeIt = NULL;
     if (RT_SUCCESS(RTCritSectEnter(&pCache->CritSect)))
     {
+        PVBOXSERVICEVEPROPCACHEENTRY pNodeIt;
         RTListForEach(&pCache->NodeHead, pNodeIt, VBOXSERVICEVEPROPCACHEENTRY, NodeSucc)
         {

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp

@@ -492 +492 @@
         {
             /* Process each input file. */
+            RTFILE hInput = NIL_RTFILE;
             PVBOXSERVICETOOLBOXPATHENTRY pNodeIt;
-            RTFILE hInput = NIL_RTFILE;
             RTListForEach(&inputList, pNodeIt, VBOXSERVICETOOLBOXPATHENTRY, Node)
             {