Changeset 78004 in vbox

Timestamp:

Apr 3, 2019 4:08:42 PM (6 years ago)

Author:

vboxsync

Message:

Main/HostDnsServiceDarwin: Formatting nits, moved hostDnsServiceStoreCallback() to the bottom. No functional changes.

File:

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

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

@@ -64 +64 @@
 }
 
-void HostDnsServiceDarwin::hostDnsServiceStoreCallback(void *, void *, void *info)
-{
-    HostDnsServiceDarwin *pThis = (HostDnsServiceDarwin *)info;
-
-    RTCLock grab(pThis->m_LockMtx);
-    pThis->updateInfo();
-}
-
-
 HRESULT HostDnsServiceDarwin::init(HostDnsMonitorProxy *pProxy)
 {
@@ -177 +168 @@
 HRESULT HostDnsServiceDarwin::updateInfo(void)
 {
-    CFPropertyListRef propertyRef = SCDynamicStoreCopyValue(m->m_store,
-                                                            kStateNetworkGlobalDNSKey);
+    CFPropertyListRef propertyRef = SCDynamicStoreCopyValue(m->m_store, kStateNetworkGlobalDNSKey);
     /**
      * # scutil
@@ -202 +192 @@
     HostDnsInformation info;
     CFStringRef domainNameRef = (CFStringRef)CFDictionaryGetValue(
-      static_cast<CFDictionaryRef>(propertyRef), CFSTR("DomainName"));
+       static_cast<CFDictionaryRef>(propertyRef), CFSTR("DomainName"));
+
     if (domainNameRef)
     {
-        const char *pszDomainName = CFStringGetCStringPtr(domainNameRef,
-                                                    CFStringGetSystemEncoding());
+        const char *pszDomainName = CFStringGetCStringPtr(domainNameRef, CFStringGetSystemEncoding());
         if (pszDomainName)
             info.domain = pszDomainName;
@@ -212 +202 @@
 
     int i, arrayCount;
+
     CFArrayRef serverArrayRef = (CFArrayRef)CFDictionaryGetValue(
-      static_cast<CFDictionaryRef>(propertyRef), CFSTR("ServerAddresses"));
+       static_cast<CFDictionaryRef>(propertyRef), CFSTR("ServerAddresses"));
     if (serverArrayRef)
     {
@@ -223 +214 @@
                 continue;
 
-            const char *pszServerAddress = CFStringGetCStringPtr(serverAddressRef,
-                                                           CFStringGetSystemEncoding());
+            const char *pszServerAddress = CFStringGetCStringPtr(serverAddressRef, CFStringGetSystemEncoding());
             if (!pszServerAddress)
                 continue;
@@ -233 +223 @@
 
     CFArrayRef searchArrayRef = (CFArrayRef)CFDictionaryGetValue(
-      static_cast<CFDictionaryRef>(propertyRef), CFSTR("SearchDomains"));
+       static_cast<CFDictionaryRef>(propertyRef), CFSTR("SearchDomains"));
+
     if (searchArrayRef)
     {
@@ -244 +235 @@
                 continue;
 
-            const char *pszSearchString = CFStringGetCStringPtr(searchStringRef,
-                                                          CFStringGetSystemEncoding());
+            const char *pszSearchString = CFStringGetCStringPtr(searchStringRef, CFStringGetSystemEncoding());
             if (!pszSearchString)
                 continue;
@@ -258 +248 @@
 
     return S_OK;
+}
+
+void HostDnsServiceDarwin::hostDnsServiceStoreCallback(void *, void *, void *info)
+{
+    HostDnsServiceDarwin *pThis = (HostDnsServiceDarwin *)info;
+
+    RTCLock grab(pThis->m_LockMtx);
+    pThis->updateInfo();
 }
 
@@ -266 +264 @@
     pThis->m_fStop = true;
 }
+