Changeset 90743 in vbox

Timestamp:

Aug 19, 2021 12:59:03 PM (3 years ago)

Author:

vboxsync

Message:

VBoxNetAdpCtl: when we check return value from execute() make it
explicit what we check for to improve readability. bugref:8093.

File:

• trunk/src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp

@@ -238 +238 @@
         {
             const char *pcszFamily = isAddrV6(pcszAddress) ? "inet6" : "inet";
-            if (execute(CmdList(pcszAdapter) << pcszFamily))
-                execute(CmdList(pcszAdapter) << pcszFamily << "plumb" << "up");
+            int status;
+
+            status = execute(CmdList(pcszAdapter) << pcszFamily);
+            if (status != EXIT_SUCCESS)
+                status = execute(CmdList(pcszAdapter) << pcszFamily << "plumb" << "up");
+            if (status != EXIT_SUCCESS)
+                return status;
+
             return CmdIfconfig::set(pcszAdapter, pcszAddress, pcszNetmask);
         };
@@ -247 +253 @@
         {
             int rc = CmdIfconfig::removeV4(pcszAdapter, pcszAddress);
+
+            /** @todo Do we really need to unplumb inet here? */
             execute(CmdList(pcszAdapter) << "inet" << "unplumb");
             return rc;