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

Timestamp:

Dec 16, 2008 10:39:34 AM (16 years ago)

Author:

vboxsync

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

41079

Message:

#3282: Collection got replaced with safe array. Warning, windows builds/tests may break.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp (modified) (1 diff)

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

@@ -203 +203 @@
         ComPtr<IHost> host;
         CHECK_ERROR(virtualBox, COMGETTER(Host)(host.asOutParam()));
-        ComPtr<IHostNetworkInterfaceCollection> coll;
-        ComPtr<IHostNetworkInterfaceEnumerator> enumerator;
-        CHECK_ERROR(host, COMGETTER(NetworkInterfaces)(coll.asOutParam()));
-        if (SUCCEEDED(rc) && coll)
-        {
-            CHECK_ERROR(coll, Enumerate(enumerator.asOutParam()));
-            BOOL hasMore;
-            while (SUCCEEDED(enumerator->HasMore(&hasMore)) && hasMore)
-            {
-                ComPtr<IHostNetworkInterface> networkInterface;
-                CHECK_RC_BREAK(enumerator->GetNext(networkInterface.asOutParam()));
+        com::SafeIfaceArray <IHostNetworkInterface> hostNetworkInterfaces;
+        CHECK_ERROR(host, 
+                    COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces)));
+        for (size_t i = 0; i < hostNetworkInterfaces.size(); ++i)
+        {
+            ComPtr<IHostNetworkInterface> networkInterface = hostNetworkInterfaces[i];
 #ifndef VBOX_WITH_HOSTNETIF_API
-                Bstr interfaceName;
-                networkInterface->COMGETTER(Name)(interfaceName.asOutParam());
-                RTPrintf("Name:        %lS\n", interfaceName.raw());
-                Guid interfaceGuid;
-                networkInterface->COMGETTER(Id)(interfaceGuid.asOutParam());
-                RTPrintf("GUID:        %lS\n\n", Bstr(interfaceGuid.toString()).raw());
+            Bstr interfaceName;
+            networkInterface->COMGETTER(Name)(interfaceName.asOutParam());
+            RTPrintf("Name:        %lS\n", interfaceName.raw());
+            Guid interfaceGuid;
+            networkInterface->COMGETTER(Id)(interfaceGuid.asOutParam());
+            RTPrintf("GUID:        %lS\n\n", Bstr(interfaceGuid.toString()).raw());
 #else /* VBOX_WITH_HOSTNETIF_API */
-                Bstr interfaceName;
-                networkInterface->COMGETTER(Name)(interfaceName.asOutParam());
-                RTPrintf("Name:            %lS\n", interfaceName.raw());
-                Guid interfaceGuid;
-                networkInterface->COMGETTER(Id)(interfaceGuid.asOutParam());
-                RTPrintf("GUID:            %lS\n", Bstr(interfaceGuid.toString()).raw());
-                ULONG IPAddress;
-                networkInterface->COMGETTER(IPAddress)(&IPAddress);
-                RTPrintf("IPAddress:       %d.%d.%d.%d\n",
-                         ((uint8_t*)&IPAddress)[0],
-                         ((uint8_t*)&IPAddress)[1],
-                         ((uint8_t*)&IPAddress)[2],
-                         ((uint8_t*)&IPAddress)[3]);
-                ULONG NetworkMask;
-                networkInterface->COMGETTER(NetworkMask)(&NetworkMask);
-                RTPrintf("NetworkMask:     %d.%d.%d.%d\n",
-                         ((uint8_t*)&NetworkMask)[0],
-                         ((uint8_t*)&NetworkMask)[1],
-                         ((uint8_t*)&NetworkMask)[2],
-                         ((uint8_t*)&NetworkMask)[3]);
-                Bstr IPV6Address;
-                networkInterface->COMGETTER(IPV6Address)(IPV6Address.asOutParam());
-                RTPrintf("IPV6Address:     %lS\n", IPV6Address.raw());
-                Bstr IPV6NetworkMask;
-                networkInterface->COMGETTER(IPV6NetworkMask)(IPV6NetworkMask.asOutParam());
-                RTPrintf("IPV6NetworkMask: %lS\n", IPV6NetworkMask.raw());
-                Bstr HardwareAddress;
-                networkInterface->COMGETTER(HardwareAddress)(HardwareAddress.asOutParam());
-                RTPrintf("HardwareAddress: %lS\n", HardwareAddress.raw());
-                HostNetworkInterfaceType_T Type;
-                networkInterface->COMGETTER(Type)(&Type);
-                RTPrintf("Type:            %s\n", getHostIfTypeText(Type));
-                HostNetworkInterfaceStatus_T Status;
-                networkInterface->COMGETTER(Status)(&Status);
-                RTPrintf("Status:          %s\n\n", getHostIfStatusText(Status));
+            Bstr interfaceName;
+            networkInterface->COMGETTER(Name)(interfaceName.asOutParam());
+            RTPrintf("Name:            %lS\n", interfaceName.raw());
+            Guid interfaceGuid;
+            networkInterface->COMGETTER(Id)(interfaceGuid.asOutParam());
+            RTPrintf("GUID:            %lS\n", Bstr(interfaceGuid.toString()).raw());
+            ULONG IPAddress;
+            networkInterface->COMGETTER(IPAddress)(&IPAddress);
+            RTPrintf("IPAddress:       %d.%d.%d.%d\n",
+                     ((uint8_t*)&IPAddress)[0],
+                     ((uint8_t*)&IPAddress)[1],
+                     ((uint8_t*)&IPAddress)[2],
+                     ((uint8_t*)&IPAddress)[3]);
+            ULONG NetworkMask;
+            networkInterface->COMGETTER(NetworkMask)(&NetworkMask);
+            RTPrintf("NetworkMask:     %d.%d.%d.%d\n",
+                     ((uint8_t*)&NetworkMask)[0],
+                     ((uint8_t*)&NetworkMask)[1],
+                     ((uint8_t*)&NetworkMask)[2],
+                     ((uint8_t*)&NetworkMask)[3]);
+            Bstr IPV6Address;
+            networkInterface->COMGETTER(IPV6Address)(IPV6Address.asOutParam());
+            RTPrintf("IPV6Address:     %lS\n", IPV6Address.raw());
+            Bstr IPV6NetworkMask;
+            networkInterface->COMGETTER(IPV6NetworkMask)(IPV6NetworkMask.asOutParam());
+            RTPrintf("IPV6NetworkMask: %lS\n", IPV6NetworkMask.raw());
+            Bstr HardwareAddress;
+            networkInterface->COMGETTER(HardwareAddress)(HardwareAddress.asOutParam());
+            RTPrintf("HardwareAddress: %lS\n", HardwareAddress.raw());
+            HostNetworkInterfaceType_T Type;
+            networkInterface->COMGETTER(Type)(&Type);
+            RTPrintf("Type:            %s\n", getHostIfTypeText(Type));
+            HostNetworkInterfaceStatus_T Status;
+            networkInterface->COMGETTER(Status)(&Status);
+            RTPrintf("Status:          %s\n\n", getHostIfStatusText(Status));
 #endif
-            }
         }
     }