Changeset 21885 in vbox for trunk/src/VBox/Main/HostImpl.cpp

Timestamp:

Jul 30, 2009 1:27:40 PM (16 years ago)

Author:

vboxsync

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

50532

Message:

ifdef indentation (needs cleanup)

File:

• trunk/src/VBox/Main/HostImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -569 +569 @@
     std::list <ComObjPtr<HostNetworkInterface> > list;
 
-#ifdef VBOX_WITH_HOSTNETIF_API
+# ifdef VBOX_WITH_HOSTNETIF_API
     int rc = NetIfList(list);
     if (rc)
@@ -575 +575 @@
         Log(("Failed to get host network interface list with rc=%Vrc\n", rc));
     }
-#else
-# if defined(RT_OS_DARWIN)
+# else
+
+#  if defined(RT_OS_DARWIN)
     PDARWINETHERNIC pEtherNICs = DarwinGetEthernetControllers();
     while (pEtherNICs)
@@ -591 +592 @@
     }
 
-# elif defined(RT_OS_SOLARIS)
-
-#  ifdef VBOX_SOLARIS_NSL_RESOLVED
+#  elif defined(RT_OS_SOLARIS)
+
+#   ifdef VBOX_SOLARIS_NSL_RESOLVED
 
     /*
@@ -612 +613 @@
         g_pfnLibDlpiWalk(vboxSolarisAddLinkHostIface, &list, 0);
 
-#  endif    /* VBOX_SOLARIS_NSL_RESOLVED */
+#   endif    /* VBOX_SOLARIS_NSL_RESOLVED */
 
     /*
@@ -688 +689 @@
     list.unique(vboxSolarisSameNIC);
 
-# elif defined RT_OS_WINDOWS
-#  ifndef VBOX_WITH_NETFLT
+#  elif defined RT_OS_WINDOWS
+#   ifndef VBOX_WITH_NETFLT
     hr = E_NOTIMPL;
-#  else /* #  if defined VBOX_WITH_NETFLT */
+#   else /* #  if defined VBOX_WITH_NETFLT */
     INetCfg              *pNc;
     INetCfgComponent     *pMpNcc;
@@ -710 +711 @@
     if(hr == S_OK)
     {
-#ifdef VBOX_NETFLT_ONDEMAND_BIND
+#    ifdef VBOX_NETFLT_ONDEMAND_BIND
         /* for the protocol-based approach for now we just get all miniports the MS_TCPIP protocol binds to */
         hr = pNc->FindComponent(L"MS_TCPIP", &pTcpIpNcc);
-#else
+#    else
         /* for the filter-based approach we get all miniports our filter (sun_VBoxNetFlt)is bound to */
         hr = pNc->FindComponent(L"sun_VBoxNetFlt", &pTcpIpNcc);
-# ifndef VBOX_WITH_HARDENING
+#     ifndef VBOX_WITH_HARDENING
         if(hr != S_OK)
         {
             /* TODO: try to install the netflt from here */
         }
-# endif
-
-#endif
+#     endif
+
+#    endif
 
         if(hr == S_OK)
@@ -784 +785 @@
         VBoxNetCfgWinReleaseINetCfg(pNc, FALSE);
     }
-#  endif /* #  if defined VBOX_WITH_NETFLT */
-
-
-# elif defined RT_OS_LINUX
+#   endif /* #  if defined VBOX_WITH_NETFLT */
+
+
+#  elif defined RT_OS_LINUX
     int sock = socket(AF_INET, SOCK_DGRAM, 0);
     if (sock >= 0)
@@ -817 +818 @@
         close(sock);
     }
-# endif /* RT_OS_LINUX */
-#endif
+#  endif /* RT_OS_LINUX */
+# endif
 
     std::list <ComObjPtr<HostNetworkInterface> >::iterator it;
@@ -825 +826 @@
         (*it)->setVirtualBox(mParent);
     }
-
 
     SafeIfaceArray<IHostNetworkInterface> networkInterfaces (list);