Changeset 28296 in vbox

Timestamp:

Apr 14, 2010 12:11:07 PM (15 years ago)

Author:

vboxsync

Message:

Main: cosmetical fixes, mostly spaces

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (1 diff)
• DHCPServerRunner.cpp (modified) (3 diffs)
• HostImpl.cpp (modified) (8 diffs)
• HostNetworkInterfaceImpl.cpp (modified) (5 diffs)
• linux/PerformanceLinux.cpp (modified) (1 diff)
• xml/Settings.cpp (modified) (8 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2673 +2673 @@
             hrc = natDriver->COMGETTER(Redirects)(ComSafeArrayAsOutParam(pfs)); H();
             PCFGMNODE pPF = NULL;          /* /Devices/Dev/.../Config/PF#0/ */
-            for(unsigned int i = 0; i < pfs.size(); ++i)
+            for (unsigned int i = 0; i < pfs.size(); ++i)
             {
                 uint16_t port = 0;

trunk/src/VBox/Main/DHCPServerRunner.cpp

@@ -58 +58 @@
 {
     for (unsigned i = 0; i < RT_ELEMENTS(g_aArgDefs); i++)
-        if(g_aArgDefs[i].Type == type)
+        if (g_aArgDefs[i].Type == type)
             return &g_aArgDefs[i];
 
@@ -140 +140 @@
 bool DHCPServerRunner::isRunning()
 {
-    if(mProcess == NIL_RTPROCESS)
+    if (mProcess == NIL_RTPROCESS)
         return false;
 
@@ -146 +146 @@
     int rc = RTProcWait(mProcess, RTPROCWAIT_FLAGS_NOBLOCK, &status);
 
-    if(rc == VERR_PROCESS_RUNNING)
+    if (rc == VERR_PROCESS_RUNNING)
         return true;
 

trunk/src/VBox/Main/HostImpl.cpp

@@ -442 +442 @@
     hr = pncc->GetDisplayName( &lpszName );
     Assert(hr == S_OK);
-    if(hr == S_OK)
+    if (hr == S_OK)
     {
         Bstr name((CBSTR)lpszName);
@@ -631 +631 @@
                        &lpszApp );
     Assert(hr == S_OK);
-    if(hr == S_OK)
+    if (hr == S_OK)
     {
 #    ifdef VBOX_NETFLT_ONDEMAND_BIND
@@ -640 +640 @@
         hr = pNc->FindComponent(L"sun_VBoxNetFlt", &pTcpIpNcc);
 #     ifndef VBOX_WITH_HARDENING
-        if(hr != S_OK)
+        if (hr != S_OK)
         {
             /* TODO: try to install the netflt from here */
@@ -648 +648 @@
 #    endif
 
-        if(hr == S_OK)
+        if (hr == S_OK)
         {
             hr = VBoxNetCfgWinGetBindingPathEnum(pTcpIpNcc, EBP_BELOW, &pEnumBp);
@@ -659 +659 @@
                 {
                     /* S_OK == enabled, S_FALSE == disabled */
-                    if(pBp->IsEnabled() == S_OK)
+                    if (pBp->IsEnabled() == S_OK)
                     {
                         hr = VBoxNetCfgWinGetBindingInterfaceEnum(pBp, &pEnumBi);
@@ -671 +671 @@
                                 hr = pBi->GetLowerComponent( &pMpNcc );
                                 Assert(hr == S_OK);
-                                if(hr == S_OK)
+                                if (hr == S_OK)
                                 {
                                     ULONG uComponentStatus;
                                     hr = pMpNcc->GetDeviceStatus(&uComponentStatus);
                                     Assert(hr == S_OK);
-                                    if(hr == S_OK)
+                                    if (hr == S_OK)
                                     {
-                                        if(uComponentStatus == 0)
+                                        if (uComponentStatus == 0)
                                         {
                                             vboxNetWinAddComponent(&list, pMpNcc);
@@ -1411 +1411 @@
     std::list <ComObjPtr<HostNetworkInterface> > allList;
     int rc = NetIfList(allList);
-    if(RT_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return E_FAIL;
 
@@ -1421 +1421 @@
         HostNetworkInterfaceType_T t;
         HRESULT hr = (*it)->COMGETTER(InterfaceType)(&t);
-        if(FAILED(hr))
+        if (FAILED(hr))
             return hr;
 
-        if(t == type)
+        if (t == type)
         {
             (*it)->setVirtualBox(m->pParent);

trunk/src/VBox/Main/HostNetworkInterfaceImpl.cpp

@@ -92 +92 @@
     NETIFINFO info;
     int rc = NetIfGetConfig(this, &info);
-    if(RT_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         m.realIPAddress = m.IPAddress = info.IPAddress.u;
@@ -236 +236 @@
 #endif
     char *addr = inet_ntoa(tmp);
-    if(addr)
+    if (addr)
     {
         Bstr(addr).detachTo(aIPAddress);
@@ -271 +271 @@
 #endif
     char *addr = inet_ntoa(tmp);
-    if(addr)
+    if (addr)
     {
         Bstr(addr).detachTo(aNetworkMask);
@@ -443 +443 @@
     ULONG ip, mask;
     ip = inet_addr(Utf8Str(aIPAddress).raw());
-    if(ip != INADDR_NONE)
+    if (ip != INADDR_NONE)
     {
         if (Bstr(aNetMask).isEmpty())
@@ -449 +449 @@
         else
             mask = inet_addr(Utf8Str(aNetMask).raw());
-        if(mask != INADDR_NONE)
+        if (mask != INADDR_NONE)
         {
             if (m.realIPAddress == ip && m.realNetworkMask == mask)

trunk/src/VBox/Main/linux/PerformanceLinux.cpp

@@ -75 +75 @@
 
     std::vector<RTPROCESS>::iterator it;
-    for(it = processes.begin(); it != processes.end(); it++)
+    for (it = processes.begin(); it != processes.end(); it++)
     {
         VMProcessStats vmStats;

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1834 +1834 @@
         if (llNetworkModes.size() > 2)
         {
-            throw ConfigFileError(this, pelmAdapter, N_("Invalid number of modes '%d' attached to Adapter attribute"), llNetworkModes.size());
+            throw ConfigFileError(this, pelmAdapter, N_("Invalid number of modes ('%d') attached to Adapter attribute"), llNetworkModes.size());
         }
         for (it = llNetworkModes.begin(); it != llNetworkModes.end(); ++it)
@@ -1845 +1845 @@
                 pelmNode->getChildElements(llDisabledNetworkModes);
                 /* run over disabled list and load settings */
-                for(itDisabled = llDisabledNetworkModes.begin(); itDisabled != llDisabledNetworkModes.end(); ++itDisabled)
+                for (itDisabled = llDisabledNetworkModes.begin();
+                     itDisabled != llDisabledNetworkModes.end(); ++itDisabled)
                 {
                     const xml::ElementNode *pelmDisabledNode = *itDisabled;
@@ -1865 +1866 @@
     {
         if (fEnabled)
-        {
             nic.mode = NetworkAttachmentType_NAT;
-        } 
-        nic.fHasDisabledNAT = (nic.mode != NetworkAttachmentType_NAT) && !fEnabled;
+
+        nic.fHasDisabledNAT = (nic.mode != NetworkAttachmentType_NAT && !fEnabled);
         elmMode.getAttributeValue("network", nic.nat.strNetwork);    // optional network name
         elmMode.getAttributeValue("hostip", nic.nat.strBindIP);
@@ -1892 +1892 @@
         xml::ElementNodesList plstNatPF;
         elmMode.getChildElements(plstNatPF, "Forwarding");
-        for(xml::ElementNodesList::iterator pf = plstNatPF.begin(); pf != plstNatPF.end(); ++pf)
+        for (xml::ElementNodesList::iterator pf = plstNatPF.begin(); pf != plstNatPF.end(); ++pf)
         {
             NATRule rule;
@@ -1907 +1907 @@
         }
     }
-    else if (    fEnabled
-              && (   (elmMode.nameEquals("HostInterface"))
-                  || (elmMode.nameEquals("BridgedInterface")))
+    else if (   fEnabled
+             && (   (elmMode.nameEquals("HostInterface"))
+                 || (elmMode.nameEquals("BridgedInterface")))
             )
     {
@@ -1922 +1922 @@
             throw ConfigFileError(this, &elmMode, N_("Required InternalNetwork/@name element is missing"));
     }
-    else if (    fEnabled
-              && elmMode.nameEquals("HostOnlyInterface"))
+    else if (   fEnabled
+             && elmMode.nameEquals("HostOnlyInterface"))
     {
         nic.mode = NetworkAttachmentType_HostOnly;
@@ -3546 +3546 @@
 }
 
-void MachineConfigFile::buildNetworkXML(NetworkAttachmentType_T mode, xml::ElementNode &elmParent, const NetworkAdapter &nic)
+/**
+ * Fill a <Network> node. Only relevant for XML version >= v1_10.
+ * @param mode
+ * @param elmParent
+ * @param nice
+ */
+void MachineConfigFile::buildNetworkXML(NetworkAttachmentType_T mode,
+                                        xml::ElementNode &elmParent,
+                                        const NetworkAdapter &nic)
 {
     switch (mode)
@@ -3584 +3592 @@
                     pelmTFTP->setAttribute("next-server", nic.nat.strTftpNextServer);
             }
-            for(NATRuleList::const_iterator rule = nic.nat.llRules.begin();
+            for (NATRuleList::const_iterator rule = nic.nat.llRules.begin();
                     rule != nic.nat.llRules.end(); ++rule)
             {