Changeset 17739 in vbox

Timestamp:

Mar 12, 2009 12:38:15 PM (16 years ago)

Author:

vboxsync

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

44256

Message:

Reduce scope of iteration indices.
Convert some commented collection code to safe-array.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -1129 +1129 @@
         CHECK_ERROR_RET (USBCtl, COMGETTER(DeviceFilters)(ComSafeArrayAsOutParam(Coll)), rc);
 
-        size_t index = 0; // Also used after the "for" below.
-
         if (Coll.size() == 0)
         {
@@ -1138 +1136 @@
         else
         {
-            for (; index < Coll.size(); ++index)
+            for (size_t index = 0; index < Coll.size(); ++index)
             {
                 ComPtr<IUSBDeviceFilter> DevPtr = Coll[index];
@@ -1208 +1206 @@
         if (console)
         {
-            index = 0;
             /* scope */
             {
@@ -1224 +1221 @@
                 else
                 {
-                    for (index = 0; index < coll.size(); ++index)
+                    for (size_t index = 0; index < coll.size(); ++index)
                     {
                         ComPtr <IHostUSBDevice> dev = coll[index];
@@ -1298 +1295 @@
             }
 
-            index = 0;
             /* scope */
             {
@@ -1314 +1310 @@
                 else
                 {
-                    for (index = 0; index < coll.size(); ++index)
+                    for (size_t index = 0; index < coll.size(); ++index)
                     {
                         ComPtr <IUSBDevice> dev = coll[index];
@@ -1399 +1395 @@
     /* globally shared folders first */
     {
-        ComPtr<ISharedFolderCollection> sfColl;
-        ComPtr<ISharedFolderEnumerator> sfEnum;
-        CHECK_ERROR_RET(virtualBox, COMGETTER(SharedFolders)(sfColl.asOutParam()), rc);
-        CHECK_ERROR_RET(sfColl, Enumerate(sfEnum.asOutParam()), rc);
-        BOOL fMore;
-        sfEnum->HasMore(&fMore);
-        while (fMore)
-        {
-            ComPtr<ISharedFolder> sf;
-            CHECK_ERROR_RET(sfEnum, GetNext(sf.asOutParam()), rc);
+        SafeIfaceArray <ISharedFolder> sfColl;
+        CHECK_ERROR_RET(virtualBox, COMGETTER(SharedFolders)(ComSafeArrayAsOutParam(sfColl)), rc);
+        for (size_t i = 0; i < sfColl.size(); ++i)
+        {
+            ComPtr<ISharedFolder> sf = sfColl[i];
             Bstr name, hostPath;
             sf->COMGETTER(Name)(name.asOutParam());
@@ -1414 +1405 @@
             RTPrintf("Name: '%lS', Host path: '%lS' (global mapping)\n", name.raw(), hostPath.raw());
             ++numSharedFolders;
-            CHECK_ERROR_RET(sfEnum, HasMore(&fMore), rc);
         }
     }