Changeset 16966 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Feb 20, 2009 9:14:28 AM (16 years ago)

Author:

vboxsync

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

43132

Message:

#3551: “Main: Replace remaining collections with safe arrays”
Converted SharedFolderCollection. Approved by dmik. Tested with GUI.

File:

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

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

@@ -1438 +1438 @@
     /* now VM mappings */
     {
-        ComPtr<ISharedFolderCollection> sfColl;
-        ComPtr<ISharedFolderEnumerator> sfEnum;
-        CHECK_ERROR_RET(machine, COMGETTER(SharedFolders)(sfColl.asOutParam()), rc);
-        CHECK_ERROR_RET(sfColl, Enumerate(sfEnum.asOutParam()), rc);
+        com::SafeIfaceArray <ISharedFolder> folders;
+
+        CHECK_ERROR_RET(machine, COMGETTER(SharedFolders)(ComSafeArrayAsOutParam(folders)), rc);
         ULONG index = 0;
-        BOOL fMore;
-        sfEnum->HasMore(&fMore);
-        while (fMore)
-        {
-            ComPtr<ISharedFolder> sf;
-            CHECK_ERROR_RET(sfEnum, GetNext(sf.asOutParam()), rc);
+
+        for (size_t i = 0; i < folders.size(); ++i)
+        {
+            ComPtr <ISharedFolder> sf = folders[i];
+
             Bstr name, hostPath;
             BOOL writable;
@@ -1467 +1465 @@
                          name.raw(), hostPath.raw(), writable ? "writable" : "readonly");
             ++numSharedFolders;
-            CHECK_ERROR_RET(sfEnum, HasMore(&fMore), rc);
         }
     }
@@ -1473 +1470 @@
     if (console)
     {
-        ComPtr<ISharedFolderCollection> sfColl;
-        ComPtr<ISharedFolderEnumerator> sfEnum;
-        CHECK_ERROR_RET(console, COMGETTER(SharedFolders)(sfColl.asOutParam()), rc);
-        CHECK_ERROR_RET(sfColl, Enumerate(sfEnum.asOutParam()), rc);
+        com::SafeIfaceArray <ISharedFolder> folders;
+
+        CHECK_ERROR_RET(console, COMGETTER(SharedFolders)(ComSafeArrayAsOutParam(folders)), rc);
         ULONG index = 0;
-        BOOL fMore;
-        sfEnum->HasMore(&fMore);
-        while (fMore)
-        {
-            ComPtr<ISharedFolder> sf;
-            CHECK_ERROR_RET(sfEnum, GetNext(sf.asOutParam()), rc);
+
+        for (size_t i = 0; i < folders.size(); ++i)
+        {
+            ComPtr <ISharedFolder> sf = folders[i];
+
             Bstr name, hostPath;
             sf->COMGETTER(Name)(name.asOutParam());
@@ -1499 +1494 @@
                 RTPrintf("Name: '%lS', Host path: '%lS' (transient mapping)\n", name.raw(), hostPath.raw());
             ++numSharedFolders;
-            CHECK_ERROR_RET(sfEnum, HasMore(&fMore), rc);
         }
     }