Changeset 87578 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Feb 3, 2021 3:43:22 PM (4 years ago)

Author:

vboxsync

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

142606

Message:

Main: Doxygen v1.8.20 seems to get confused by appendTokenizedStrings and dumpHostDnsStrVector prototypes and unable to match them to definitions, so just move the definitions up to the top and drop the prototypes.

Location:

trunk/src/VBox/Main/src-server

Files:

• HostDnsService.cpp (modified) (4 diffs)
• win/HostDnsServiceWin.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/HostDnsService.cpp

@@ -36 +36 @@
 
 
-static void dumpHostDnsInformation(const HostDnsInformation&);
-static void dumpHostDnsStrVector(const std::string &prefix, const std::vector<std::string> &v);
-
+
+static void dumpHostDnsStrVector(const std::string &prefix, const std::vector<std::string> &v)
+{
+    int i = 1;
+    for (std::vector<std::string>::const_iterator it = v.begin();
+         it != v.end();
+         ++it, ++i)
+        LogRel(("  %s %d: %s\n", prefix.c_str(), i, it->c_str()));
+    if (v.empty())
+        LogRel(("  no %s entries\n", prefix.c_str()));
+}
+
+static void dumpHostDnsInformation(const HostDnsInformation &info)
+{
+    dumpHostDnsStrVector("server", info.servers);
+
+    if (!info.domain.empty())
+        LogRel(("  domain: %s\n", info.domain.c_str()));
+    else
+        LogRel(("  no domain set\n"));
+
+    dumpHostDnsStrVector("search string", info.searchList);
+}
 
 bool HostDnsInformation::equals(const HostDnsInformation &info, uint32_t fLaxComparison) const
@@ -44 +64 @@
     bool fSameServers;
     if ((fLaxComparison & IGNORE_SERVER_ORDER) == 0)
-    {
         fSameServers = (servers == info.servers);
-    }
     else
     {
@@ -62 +80 @@
     }
     else
-    {
         fSameDomain = fSameSearchList = true;
-    }
 
     return fSameServers && fSameDomain && fSameSearchList;
@@ -413 +429 @@
 }
 
-static void dumpHostDnsInformation(const HostDnsInformation &info)
-{
-    dumpHostDnsStrVector("server", info.servers);
-
-    if (!info.domain.empty())
-        LogRel(("  domain: %s\n", info.domain.c_str()));
-    else
-        LogRel(("  no domain set\n"));
-
-    dumpHostDnsStrVector("search string", info.searchList);
-}
-
-
-static void dumpHostDnsStrVector(const std::string &prefix, const std::vector<std::string> &v)
-{
-    int i = 1;
-    for (std::vector<std::string>::const_iterator it = v.begin();
-         it != v.end();
-         ++it, ++i)
-        LogRel(("  %s %d: %s\n", prefix.c_str(), i, it->c_str()));
-    if (v.empty())
-        LogRel(("  no %s entries\n", prefix.c_str()));
-}

trunk/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp

@@ -42 +42 @@
 #include <vector>
 
-static inline int registerNotification(const HKEY& hKey, HANDLE& hEvent);
-static void appendTokenizedStrings(std::vector<std::string> &vecStrings, const std::string &strToAppend, char chDelim = ' ');
+
+DECLINLINE(int) registerNotification(const HKEY &hKey, HANDLE &hEvent)
+{
+    LONG lrc = RegNotifyChangeKeyValue(hKey,
+                                       TRUE,
+                                       REG_NOTIFY_CHANGE_LAST_SET,
+                                       hEvent,
+                                       TRUE);
+    AssertMsgReturn(lrc == ERROR_SUCCESS,
+                    ("Failed to register event on the key. Please debug me!"),
+                    VERR_INTERNAL_ERROR);
+
+    return VINF_SUCCESS;
+}
+
+static void appendTokenizedStrings(std::vector<std::string> &vecStrings, const std::string &strToAppend, char chDelim /* = ' ' */)
+{
+    if (strToAppend.empty())
+        return;
+
+    std::istringstream stream(strToAppend);
+    std::string substr;
+
+    while (std::getline(stream, substr, chDelim))
+    {
+        if (substr.empty())
+            continue;
+
+        if (std::find(vecStrings.cbegin(), vecStrings.cend(), substr) != vecStrings.cend())
+            continue;
+
+        vecStrings.push_back(substr);
+    }
+}
+
 
 struct HostDnsServiceWin::Data
@@ -444 +477 @@
 }
 
-static inline int registerNotification(const HKEY& hKey, HANDLE& hEvent)
-{
-    LONG lrc = RegNotifyChangeKeyValue(hKey,
-                                       TRUE,
-                                       REG_NOTIFY_CHANGE_LAST_SET,
-                                       hEvent,
-                                       TRUE);
-    AssertMsgReturn(lrc == ERROR_SUCCESS,
-                    ("Failed to register event on the key. Please debug me!"),
-                    VERR_INTERNAL_ERROR);
-
-    return VINF_SUCCESS;
-}
-
-static void appendTokenizedStrings(std::vector<std::string> &vecStrings, const std::string &strToAppend, char chDelim /* = ' ' */)
-{
-    if (strToAppend.empty())
-        return;
-
-    std::istringstream stream(strToAppend);
-    std::string substr;
-
-    while (std::getline(stream, substr, chDelim))
-    {
-        if (substr.empty())
-            continue;
-
-        if (std::find(vecStrings.cbegin(), vecStrings.cend(), substr) != vecStrings.cend())
-            continue;
-
-        vecStrings.push_back(substr);
-    }
-}
-