Changeset 77984 in vbox for trunk/src/VBox/Main/src-server/darwin

Timestamp:

Apr 2, 2019 2:06:13 PM (6 years ago)

Author:

vboxsync

Message:

Main/HostDnsService: Renaming and cleanup (no functional changes).

File:

• trunk/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp

@@ -51 +51 @@
 
 
-HostDnsServiceDarwin::HostDnsServiceDarwin():HostDnsMonitor(true),m(NULL)
+HostDnsServiceDarwin::HostDnsServiceDarwin()
+    : HostDnsServiceBase(true)
+    , m(NULL)
 {
     m = new HostDnsServiceDarwin::Data();
@@ -86 +88 @@
 
 
-HRESULT HostDnsServiceDarwin::init(HostDnsMonitorProxy *proxy)
+HRESULT HostDnsServiceDarwin::init(HostDnsMonitorProxy *pProxy)
 {
     SCDynamicStoreContext ctx;
@@ -94 +96 @@
 
     m->m_store = SCDynamicStoreCreate(NULL, CFSTR("org.virtualbox.VBoxSVC"),
-                                   (SCDynamicStoreCallBack)HostDnsServiceDarwin::hostDnsServiceStoreCallback,
-                                   &ctx);
+                                      (SCDynamicStoreCallBack)HostDnsServiceDarwin::hostDnsServiceStoreCallback,
+                                      &ctx);
     AssertReturn(m->m_store, E_FAIL);
 
@@ -111 +113 @@
     AssertReturn(m->m_Stopper, E_FAIL);
 
-    HRESULT hrc = HostDnsMonitor::init(proxy);
+    HRESULT hrc = HostDnsServiceBase::init(pProxy);
     AssertComRCReturn(hrc, hrc);
 
@@ -118 +120 @@
 
 
-void HostDnsServiceDarwin::monitorThreadShutdown()
+void HostDnsServiceDarwin::monitorThreadShutdown(void)
 {
     RTCLock grab(m_LockMtx);
@@ -132 +134 @@
 
 
-int HostDnsServiceDarwin::monitorWorker()
+int HostDnsServiceDarwin::monitorWorker(void)
 {
     m->m_RunLoopRef = CFRunLoopGetCurrent();
@@ -168 +170 @@
 }
 
-
-HRESULT HostDnsServiceDarwin::updateInfo()
+HRESULT HostDnsServiceDarwin::updateInfo(void)
 {
     CFPropertyListRef propertyRef = SCDynamicStoreCopyValue(m->m_store,
@@ -254 +255 @@
 }
 
-void HostDnsServiceDarwin::Data::performShutdownCallback(void *info)
-{
-    HostDnsServiceDarwin::Data *pThis = static_cast<HostDnsServiceDarwin::Data *>(info);
+void HostDnsServiceDarwin::Data::performShutdownCallback(void *pInfo)
+{
+    HostDnsServiceDarwin::Data *pThis = static_cast<HostDnsServiceDarwin::Data *>(pInfo);
     AssertPtrReturnVoid(pThis);
     pThis->m_fStop = true;