Changeset 85266 in vbox

Timestamp:

Jul 12, 2020 1:04:10 AM (5 years ago)

Author:

vboxsync

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

139243

Message:

Main/HostImpl.cpp: Some cleanups around NetIfCreateHostOnlyNetworkInterface. bugref:9790

File:

• trunk/src/VBox/Main/src-server/HostImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -419 +419 @@
         ComPtr<IProgress> progress;
 
-        int r = NetIfCreateHostOnlyNetworkInterface(m->pParent,
-                                                    hif.asOutParam(),
-                                                    progress.asOutParam(),
-                                                    it->c_str());
-        if (RT_FAILURE(r))
-            LogRel(("failed to create %s, error (0x%x)\n", it->c_str(), r));
+        int vrc = NetIfCreateHostOnlyNetworkInterface(m->pParent,
+                                                      hif.asOutParam(),
+                                                      progress.asOutParam(),
+                                                      it->c_str());
+        if (RT_FAILURE(vrc))
+            LogRel(("failed to create %s, error (%Rrc)\n", it->c_str(), vrc));
     }
 
@@ -714 +714 @@
             ComPtr<IProgress> progress;
 
-            int rc = NetIfCreateHostOnlyNetworkInterface(m->pParent, hif.asOutParam(), progress.asOutParam(), pInfo->bstrName.raw());
-            if (RT_FAILURE(rc))
+            int vrc = NetIfCreateHostOnlyNetworkInterface(m->pParent, hif.asOutParam(), progress.asOutParam(),
+                                                          pInfo->bstrName.raw());
+            if (RT_FAILURE(vrc))
             {
-                LogRel(("Failed to create host-only adapter (%d)\n", rc));
+                LogRel(("Failed to create host-only adapter (%Rrc)\n", vrc));
                 hrc = E_UNEXPECTED;
                 break;
             }
+
             /* Wait for the adapter to get configured completely, before we modify IP addresses. */
             progress->WaitForCompletion(-1);
@@ -1421 +1423 @@
      * called below grabs the VirtualBox lock. */
 
-    int r = NetIfCreateHostOnlyNetworkInterface(m->pParent, aHostInterface.asOutParam(), aProgress.asOutParam());
-    if (RT_SUCCESS(r))
+    int vrc = NetIfCreateHostOnlyNetworkInterface(m->pParent, aHostInterface.asOutParam(), aProgress.asOutParam());
+    if (RT_SUCCESS(vrc))
     {
         if (aHostInterface.isNull())
@@ -1428 +1430 @@
                             tr("Unable to create a host network interface"));
 
-#if !defined(RT_OS_WINDOWS)
+# if !defined(RT_OS_WINDOWS)
         Bstr tmpAddr, tmpMask, tmpName;
         HRESULT hrc;
@@ -1453 +1455 @@
                                                tmpMask.raw());
         ComAssertComRCRet(hrc, hrc);
-#endif /* !defined(RT_OS_WINDOWS) */
+# endif /* !defined(RT_OS_WINDOWS) */
     }