Changeset 50213 in vbox for trunk/src/VBox/NetworkServices/NetLib

Timestamp:

Jan 24, 2014 8:23:12 AM (11 years ago)

Author:

vboxsync

Message:

spaces

Location:

trunk/src/VBox/NetworkServices/NetLib

Files:

• ComHostUtils.cpp (modified) (3 diffs)
• VBoxNetBaseService.cpp (modified) (2 diffs)
• VBoxNetBaseService.h (modified) (1 diff)
• shared_ptr.h (modified) (7 diffs)
• utils.h (modified) (6 diffs)

trunk/src/VBox/NetworkServices/NetLib/ComHostUtils.cpp

@@ -122 +122 @@
  * variant but it's C++11.
  */
-int hostDnsServers(const ComHostPtr& host, const RTNETADDRIPV4& networkid, 
+int hostDnsServers(const ComHostPtr& host, const RTNETADDRIPV4& networkid,
                    /*const*/ AddressToOffsetMapping& mapping, AddressList& servers)
 {
@@ -166 +166 @@
 
     ComBstrArray strs;
-    if (SUCCEEDED(host->COMGETTER(SearchStrings)(ComSafeArrayAsOutParam(strs)))) 
+    if (SUCCEEDED(host->COMGETTER(SearchStrings)(ComSafeArrayAsOutParam(strs))))
     {
         for (unsigned int i = 0; i < strs.size(); ++i)
@@ -193 +193 @@
 
 
-int createNatListener(ComNatListenerPtr& listener, const ComVirtualBoxPtr& vboxptr, 
+int createNatListener(ComNatListenerPtr& listener, const ComVirtualBoxPtr& vboxptr,
                       NATNetworkEventAdapter *adapter, /* const */ ComEventTypeArray& events)
 {

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp

@@ -726 +726 @@
 {
     AssertMsgReturn(isMainNeeded(), ("It's expected that we need Main"), VERR_INTERNAL_ERROR);
-        
+
     /* start receiving thread */
     int rc = RTThreadCreate(&m->m_hThrRecv, /* thread handle*/
@@ -743 +743 @@
     {
         m->m_EventQ->processEventQueue(0);
-            
+
         if (m->fShutdown)
             break;

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h

@@ -57 +57 @@
 };
 
-# ifndef BASE_SERVICES_ONLY 
+# ifndef BASE_SERVICES_ONLY
 class VBoxNetBaseService: public VBoxNetHlpUDPService, public VBoxNetLockee
 {

trunk/src/VBox/NetworkServices/NetLib/shared_ptr.h

@@ -3 +3 @@
 
 #ifdef __cplusplus
-template<typename T> 
+template<typename T>
 class SharedPtr
 {
-    struct imp 
+    struct imp
     {
         imp(T *pTrg = NULL, int cnt = 1): ptr(pTrg),refcnt(cnt){}
@@ -15 +15 @@
     };
 
-    
+
     public:
     SharedPtr(T *t = NULL):p(NULL)
@@ -21 +21 @@
         p = new imp(t);
     }
-    
+
     ~SharedPtr()
     {
@@ -40 +40 @@
     {
         if (p == rhs.p) return *this;
-        
+
         p->refcnt--;
-        if (p->refcnt == 0) 
+        if (p->refcnt == 0)
             delete p;
 
@@ -57 +57 @@
     }
 
-    
+
     T *operator->()
     {
@@ -63 +63 @@
     }
 
-    
+
     const T*operator->() const
     {
@@ -79 +79 @@
 };
 #endif
+
 #endif

trunk/src/VBox/NetworkServices/NetLib/utils.h

@@ -33 +33 @@
 typedef std::map<RTNETADDRIPV4, int> AddressToOffsetMapping;
 
-  
+
 inline bool isDhcpRequired(const ComNatPtr& nat)
 {
@@ -39 +39 @@
     if (FAILED(nat->COMGETTER(NeedDhcpServer)(&fNeedDhcpServer)))
         return false;
-    
+
     return fNeedDhcpServer;
 }
@@ -49 +49 @@
                                                           dhcp.asOutParam());
     AssertComRCReturn(hrc, VERR_NOT_FOUND);
-    
+
     return VINF_SUCCESS;
 }
@@ -60 +60 @@
 
     AssertComRCReturn(hrc, VERR_NOT_FOUND);
-    
+
     return VINF_SUCCESS;
 }
@@ -120 +120 @@
 typedef ListenerImpl<NATNetworkListener, NATNetworkEventAdapter*> NATNetworkListenerImpl;
 
-# if VBOX_WITH_XPCOM 
+# if VBOX_WITH_XPCOM
 class NS_CLASSINFO_NAME(NATNetworkListenerImpl);
 # endif
@@ -127 +127 @@
 typedef com::SafeArray<VBoxEventType_T> ComEventTypeArray;
 
-/* XXX: const is commented out because of compilation erro on Windows host, but it's intended that this function 
+/* XXX: const is commented out because of compilation erro on Windows host, but it's intended that this function
  isn't modify event type array */
-int createNatListener(ComNatListenerPtr& listener, const ComVirtualBoxPtr& vboxptr, 
+int createNatListener(ComNatListenerPtr& listener, const ComVirtualBoxPtr& vboxptr,
                       NATNetworkEventAdapter *adapter, /* const */ ComEventTypeArray& events);
 #endif