Changeset 50874 in vbox for trunk/src/VBox/Main/src-server/generic

Timestamp:

Mar 25, 2014 6:29:02 PM (11 years ago)

Author:

vboxsync

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

92972

Message:

6813 src-all/ProgressImp.cpp + some formatting/line length sorting

File:

• trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp

@@ -157 +157 @@
 }
 
-int NetIfEnableStaticIpConfigV6(VirtualBox * /* vBox */, HostNetworkInterface * pIf, IN_BSTR aOldIPV6Address, IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength)
+int NetIfEnableStaticIpConfigV6(VirtualBox * /* vBox */, HostNetworkInterface * pIf, IN_BSTR aOldIPV6Address,
+                                IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength)
 {
     char szAddress[5*8 + 1 + 5 + 1];
@@ -205 +206 @@
             if (RT_FAILURE(rc))
             {
-                progress->notifyComplete(E_FAIL,
-                                         COM_IIDOF(IHostNetworkInterface),
-                                         HostNetworkInterface::getStaticComponentName(),
-                                         "Failed to get program path, rc=%Rrc\n", rc);
+                progress->i_notifyComplete(E_FAIL,
+                                           COM_IIDOF(IHostNetworkInterface),
+                                           HostNetworkInterface::getStaticComponentName(),
+                                           "Failed to get program path, rc=%Rrc\n", rc);
                 return rc;
             }
@@ -235 +236 @@
                     if (!strncmp(VBOXNETADPCTL_NAME ":", szBuf, sizeof(VBOXNETADPCTL_NAME)))
                     {
-                        progress->notifyComplete(E_FAIL,
-                                                 COM_IIDOF(IHostNetworkInterface),
-                                                 HostNetworkInterface::getStaticComponentName(),
-                                                 "%s", szBuf);
+                        progress->i_notifyComplete(E_FAIL,
+                                                   COM_IIDOF(IHostNetworkInterface),
+                                                   HostNetworkInterface::getStaticComponentName(),
+                                                   "%s", szBuf);
                         pclose(fp);
                         return E_FAIL;
@@ -254 +255 @@
                         if (RT_FAILURE(rc))
                         {
-                            progress->notifyComplete(E_FAIL,
-                                                     COM_IIDOF(IHostNetworkInterface),
-                                                     HostNetworkInterface::getStaticComponentName(),
-                                                     "Failed to get config info for %s (as reported by '" VBOXNETADPCTL_NAME " add')\n", szBuf);
+                            progress->i_notifyComplete(E_FAIL,
+                                                       COM_IIDOF(IHostNetworkInterface),
+                                                       HostNetworkInterface::getStaticComponentName(),
+                                                       "Failed to get config info for %s (as reported by '"
+                                                       VBOXNETADPCTL_NAME " add')\n", szBuf);
                         }
                         else
@@ -273 +275 @@
                     if ((rc = pclose(fp)) != 0)
                     {
-                        progress->notifyComplete(E_FAIL,
-                                                 COM_IIDOF(IHostNetworkInterface),
-                                                 HostNetworkInterface::getStaticComponentName(),
-                                                 "Failed to execute '" VBOXNETADPCTL_NAME " add' (exit status: %d)", rc);
+                        progress->i_notifyComplete(E_FAIL,
+                                                   COM_IIDOF(IHostNetworkInterface),
+                                                   HostNetworkInterface::getStaticComponentName(),
+                                                   "Failed to execute '" VBOXNETADPCTL_NAME " add' (exit status: %d)", rc);
                         rc = VERR_INTERNAL_ERROR;
                     }
@@ -284 +286 @@
                     /* Failed to add an interface */
                     rc = VERR_PERMISSION_DENIED;
-                    progress->notifyComplete(E_FAIL,
-                                             COM_IIDOF(IHostNetworkInterface),
-                                             HostNetworkInterface::getStaticComponentName(),
-                                             "Failed to execute '" VBOXNETADPCTL_NAME " add' (exit status: %d). Check permissions!", rc);
+                    progress->i_notifyComplete(E_FAIL,
+                                               COM_IIDOF(IHostNetworkInterface),
+                                               HostNetworkInterface::getStaticComponentName(),
+                                               "Failed to execute '" VBOXNETADPCTL_NAME
+                                               " add' (exit status: %d). Check permissions!", rc);
                     pclose(fp);
                 }
             }
             if (RT_SUCCESS(rc))
-                progress->notifyComplete(rc);
+                progress->i_notifyComplete(rc);
             else
                 hrc = E_FAIL;
@@ -337 +340 @@
             rc = NetIfAdpCtl(Utf8Str(ifname).c_str(), "remove", NULL, NULL);
             if (RT_FAILURE(rc))
-                progress->notifyComplete(E_FAIL,
-                                         COM_IIDOF(IHostNetworkInterface),
-                                         HostNetworkInterface::getStaticComponentName(),
-                                         "Failed to execute '" VBOXNETADPCTL_NAME "' (exit status: %d)", rc);
+                progress->i_notifyComplete(E_FAIL,
+                                           COM_IIDOF(IHostNetworkInterface),
+                                           HostNetworkInterface::getStaticComponentName(),
+                                           "Failed to execute '" VBOXNETADPCTL_NAME "' (exit status: %d)", rc);
             else
-                progress->notifyComplete(S_OK);
+                progress->i_notifyComplete(S_OK);
         }
     }
     else
     {
-        progress->notifyComplete(hr);
+        progress->i_notifyComplete(hr);
         rc = VERR_INTERNAL_ERROR;
     }