Changeset 16207 in vbox

Timestamp:

Jan 23, 2009 5:49:31 PM (16 years ago)

Author:

vboxsync

Message:

Replaced iterations over IHostNetworkInterface array with FindHostNetworkInterfaceById and FindHostNetworkInterfaceByName where appropriate.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (1 diff)
• ConsoleImpl2.cpp (modified) (2 diffs)
• HostImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -4253 +4253 @@
                 ComPtr<IHost> host;
                 virtualBox->COMGETTER(Host)(host.asOutParam());
-                com::SafeIfaceArray <IHostNetworkInterface> hostNetworkInterfaces;
-                host->COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces));
-                bool found = false;
-                for (size_t i = 0; i < hostNetworkInterfaces.size(); ++i)
-                {
-                    Bstr name;
-                    hostNetworkInterfaces[i]->COMGETTER(Name) (name.asOutParam());
-                    if (name == hostif)
-                    {
-                        found = true;
-                        break;
-                    }
-                }
-                if (!found)
+                ComPtr<IHostNetworkInterface> hostInterface;
+                if (!SUCCEEDED(host->FindHostNetworkInterfaceByName(hostif, hostInterface.asOutParam())))
                 {
                     return setError (VBOX_E_HOST_ERROR,

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1322 +1322 @@
 
 # elif defined(RT_OS_WINDOWS)
-                    com::SafeIfaceArray <IHostNetworkInterface> hostNetworkInterfaces;
-                    hrc = host->COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces));
-                    if(FAILED(hrc))
-                    {
-                        LogRel(("NetworkAttachmentType_HostInterface: COMGETTER(NetworkInterfaces) failed, hrc (0x%x)", hrc));
-                        H();
-                    }
                     ComPtr<IHostNetworkInterface> hostInterface;
-                    for (size_t i = 0; i < hostNetworkInterfaces.size(); ++i)
-                    {
-                        Bstr name;
-                        hostNetworkInterfaces[i]->COMGETTER(Name) (name.asOutParam());
-                        if (name == HifName)
-                        {
-                            hostInterface = hostNetworkInterfaces[i];
-                            break;
-                        }
-                    }
-                    if (hostInterface.isNull())
+                    rc = host->FindHostNetworkInterfaceByName(HifName, hostInterface.asOutParam());
+                    if (!SUCCEEDED(rc))
                     {
                         AssertBreakpoint();
@@ -1518 +1502 @@
                     Bstr hostInterfaceName;
                     hrc = networkAdapter->COMGETTER(HostInterface)(hostInterfaceName.asOutParam()); H();
-                    com::SafeIfaceArray <IHostNetworkInterface> hostNetworkInterfaces;
-                    hrc = host->COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces)); H();
                     ComPtr<IHostNetworkInterface> hostInterface;
-                    for (size_t i = 0; i < hostNetworkInterfaces.size(); ++i)
-                    {
-                        Bstr name;
-                        hostNetworkInterfaces[i]->COMGETTER(Name) (name.asOutParam());
-                        if (name == hostInterfaceName)
-                        {
-                            hostInterface = hostNetworkInterfaces[i];
-                            break;
-                        }
-                    }
-                    if (hostInterface.isNull())
+                    rc = host->FindHostNetworkInterfaceByName(hostInterfaceName, hostInterface.asOutParam());
+                    if (!SUCCEEDED(rc))
                     {
                         AssertMsgFailed(("Cannot get GUID for host interface '%ls'\n", hostInterfaceName));

trunk/src/VBox/Main/HostImpl.cpp

@@ -1386 +1386 @@
     /* first check whether an interface with the given name already exists */
     {
-        com::SafeIfaceArray <IHostNetworkInterface> hostNetworkInterfaces;
-        rc = COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces));
-        CheckComRCReturnRC (rc);
-        for (size_t i = 0; i < hostNetworkInterfaces.size(); ++i)
-        {
-            Bstr name;
-            hostNetworkInterfaces[i]->COMGETTER(Name) (name.asOutParam());
-            if (name == aName)
-            {
-                return setError (E_INVALIDARG,
-                                 tr ("Host network interface '%ls' already exists"), aName);
-            }
-        }
+        ComPtr <IHostNetworkInterface> iface;
+        if (SUCCEEDED (FindHostNetworkInterfaceByName (aName, iface.asOutParam())))
+            return setError (E_INVALIDARG,
+                             tr ("Host network interface '%ls' already exists"), aName);
     }
 
@@ -1454 +1445 @@
     /* first check whether an interface with the given name already exists */
     {
-        com::SafeIfaceArray <IHostNetworkInterface> hostNetworkInterfaces;
-        rc = COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces));
-        CheckComRCReturnRC (rc);
         ComPtr <IHostNetworkInterface> iface;
-        for (size_t i = 0; i < hostNetworkInterfaces.size(); ++i)
-        {
-            Guid guid;
-            hostNetworkInterfaces[i]->COMGETTER(Id) (guid.asOutParam());
-            if (guid == aId)
-            {
-                iface = hostNetworkInterfaces[i];
-                break;
-            }
-        }
-        if (iface.isNull())
+        if (FAILED (FindHostNetworkInterfaceById (aId, iface.asOutParam())))
             return setError (VBOX_E_OBJECT_NOT_FOUND,
                 tr ("Host network interface with UUID {%RTuuid} does not exist"),