Changeset 90692 in vbox for trunk/src/VBox

Timestamp:

Aug 16, 2021 9:20:36 AM (3 years ago)

Author:

vboxsync

Message:

IPRT: Corrected three RTLogGetXxxx functions to RTLogQueryXxxx (getters shall not return an IPRT status code). bugref:10086

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/VBoxGuest-linux.c (modified) (3 diffs)
• Debugger/DBGCCommands.cpp (modified) (3 diffs)
• Main/src-client/MachineDebuggerImpl.cpp (modified) (1 diff)
• Main/src-global/win/VBoxSDS.cpp (modified) (1 diff)
• Main/src-server/UnattendedImpl.cpp (modified) (1 diff)
• Main/src-server/win/svcmain.cpp (modified) (1 diff)
• Runtime/VBox/VBoxRTImp.def (modified) (2 diffs)
• Runtime/common/log/log.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c

@@ -1211 +1211 @@
     *pszBuf = '\0';
     if (pLogger)
-        RTLogGetGroupSettings(pLogger, pszBuf, _4K);
+        RTLogQueryGroupSettings(pLogger, pszBuf, _4K);
     return strlen(pszBuf);
 }
@@ -1236 +1236 @@
     *pszBuf = '\0';
     if (pLogger)
-        RTLogGetFlags(pLogger, pszBuf, _4K);
+        RTLogQueryFlags(pLogger, pszBuf, _4K);
     return strlen(pszBuf);
 }
@@ -1261 +1261 @@
     *pszBuf = '\0';
     if (pLogger)
-        RTLogGetDestinations(pLogger, pszBuf, _4K);
+        RTLogQueryDestinations(pLogger, pszBuf, _4K);
     return strlen(pszBuf);
 }

trunk/src/VBox/Debugger/DBGCCommands.cpp

@@ -1200 +1200 @@
     {
         char szBuf[_64K];
-        rc = RTLogGetGroupSettings(NULL, szBuf, sizeof(szBuf));
+        rc = RTLogQueryGroupSettings(NULL, szBuf, sizeof(szBuf));
         if (RT_FAILURE(rc))
-            return DBGCCmdHlpVBoxError(pCmdHlp, rc, "RTLogGetDestinations(NULL,,%#zx)\n", sizeof(szBuf));
+            return DBGCCmdHlpVBoxError(pCmdHlp, rc, "RTLogQueryGroupSettings(NULL,,%#zx)\n", sizeof(szBuf));
         DBGCCmdHlpPrintf(pCmdHlp, "VBOX_LOG=%s\n", szBuf);
     }
@@ -1225 +1225 @@
     {
         char szBuf[_16K];
-        rc = RTLogGetDestinations(NULL, szBuf, sizeof(szBuf));
+        rc = RTLogQueryDestinations(NULL, szBuf, sizeof(szBuf));
         if (RT_FAILURE(rc))
-            return DBGCCmdHlpVBoxError(pCmdHlp, rc, "RTLogGetDestinations(NULL,,%#zx)\n", sizeof(szBuf));
+            return DBGCCmdHlpVBoxError(pCmdHlp, rc, "RTLogQueryDestinations(NULL,,%#zx)\n", sizeof(szBuf));
         DBGCCmdHlpPrintf(pCmdHlp, "VBOX_LOG_DEST=%s\n", szBuf);
     }
@@ -1250 +1250 @@
     {
         char szBuf[_16K];
-        rc = RTLogGetFlags(NULL, szBuf, sizeof(szBuf));
+        rc = RTLogQueryFlags(NULL, szBuf, sizeof(szBuf));
         if (RT_FAILURE(rc))
-            return DBGCCmdHlpVBoxError(pCmdHlp, rc, "RTLogGetFlags(NULL,,%#zx)\n", sizeof(szBuf));
+            return DBGCCmdHlpVBoxError(pCmdHlp, rc, "RTLogQueryFlags(NULL,,%#zx)\n", sizeof(szBuf));
         DBGCCmdHlpPrintf(pCmdHlp, "VBOX_LOG_FLAGS=%s\n", szBuf);
     }

trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp

@@ -477 +477 @@
 HRESULT MachineDebugger::getLogDbgFlags(com::Utf8Str &aLogDbgFlags)
 {
-    return i_logStringProps(RTLogGetDefaultInstance(), RTLogGetFlags, "RTGetFlags", &aLogDbgFlags);
+    return i_logStringProps(RTLogGetDefaultInstance(), RTLogQueryFlags, "RTLogQueryFlags", &aLogDbgFlags);
 }
 
 HRESULT MachineDebugger::getLogDbgGroups(com::Utf8Str &aLogDbgGroups)
 {
-    return i_logStringProps(RTLogGetDefaultInstance(), RTLogGetGroupSettings, "RTLogGetGroupSettings", &aLogDbgGroups);
+    return i_logStringProps(RTLogGetDefaultInstance(), RTLogQueryGroupSettings, "RTLogQueryGroupSettings", &aLogDbgGroups);
 }
 
 HRESULT MachineDebugger::getLogDbgDestinations(com::Utf8Str &aLogDbgDestinations)
 {
-    return i_logStringProps(RTLogGetDefaultInstance(), RTLogGetDestinations, "RTLogGetDestinations", &aLogDbgDestinations);
+    return i_logStringProps(RTLogGetDefaultInstance(), RTLogQueryDestinations, "RTLogQueryDestinations", &aLogDbgDestinations);
 }
 
 HRESULT MachineDebugger::getLogRelFlags(com::Utf8Str &aLogRelFlags)
 {
-    return i_logStringProps(RTLogRelGetDefaultInstance(), RTLogGetFlags, "RTGetFlags", &aLogRelFlags);
+    return i_logStringProps(RTLogRelGetDefaultInstance(), RTLogQueryFlags, "RTLogQueryFlags", &aLogRelFlags);
 }
 
 HRESULT MachineDebugger::getLogRelGroups(com::Utf8Str &aLogRelGroups)
 {
-    return i_logStringProps(RTLogRelGetDefaultInstance(), RTLogGetGroupSettings, "RTLogGetGroupSettings", &aLogRelGroups);
+    return i_logStringProps(RTLogRelGetDefaultInstance(), RTLogQueryGroupSettings, "RTLogQueryGroupSettings", &aLogRelGroups);
 }
 
 HRESULT MachineDebugger::getLogRelDestinations(com::Utf8Str &aLogRelDestinations)
 {
-    return i_logStringProps(RTLogRelGetDefaultInstance(), RTLogGetDestinations, "RTLogGetDestinations", &aLogRelDestinations);
+    return i_logStringProps(RTLogRelGetDefaultInstance(), RTLogQueryDestinations, "RTLogQueryDestinations", &aLogRelDestinations);
 }
 

trunk/src/VBox/Main/src-global/win/VBoxSDS.cpp

@@ -642 +642 @@
                 {
                     char szDest[1024];
-                    int rc = ::RTLogGetDestinations(pReleaseLogger, szDest, sizeof(szDest));
+                    int rc = ::RTLogQueryDestinations(pReleaseLogger, szDest, sizeof(szDest));
                     if (RT_SUCCESS(rc))
                     {

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

@@ -2287 +2287 @@
     if (aHostname.length() > (aHostname.endsWith(".") ? 254U : 253U))
         return setErrorBoth(E_INVALIDARG, VERR_INVALID_NAME,
-                            tr("Hostname '%s' is %zu bytes long, max is 253 (excluing trailing dot)"),
+                            tr("Hostname '%s' is %zu bytes long, max is 253 (excluding trailing dot)"),
                             aHostname.c_str(), aHostname.length());
     size_t      cLabels  = 0;

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

@@ -158 +158 @@
             {
                 char szDest[1024];
-                int rc = RTLogGetDestinations(pReleaseLogger, szDest, sizeof(szDest));
+                int rc = RTLogQueryDestinations(pReleaseLogger, szDest, sizeof(szDest));
                 if (RT_SUCCESS(rc))
                 {

trunk/src/VBox/Runtime/VBox/VBoxRTImp.def

@@ -1277 +1277 @@
     RTLogGetDefaultInstance
     RTLogGetDefaultInstanceEx
-    RTLogGetDestinations
-    RTLogGetFlags
-    RTLogGetGroupSettings
     RTLogGroupSettings
     RTLogLogger
@@ -1287 +1284 @@
     RTLogPrintf
     RTLogPrintfV
+    RTLogQueryDestinations
+    RTLogQueryFlags
+    RTLogQueryGroupSettings
     RTLogRelGetDefaultInstance
     RTLogRelGetDefaultInstanceEx

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -1918 +1918 @@
  *                              than zero.
  */
-RTDECL(int) RTLogGetGroupSettings(PRTLOGGER pLogger, char *pszBuf, size_t cchBuf)
+RTDECL(int) RTLogQueryGroupSettings(PRTLOGGER pLogger, char *pszBuf, size_t cchBuf)
 {
     bool        fNotFirst = false;
@@ -1977 +1977 @@
     return rc;
 }
-RT_EXPORT_SYMBOL(RTLogGetGroupSettings);
+RT_EXPORT_SYMBOL(RTLogQueryGroupSettings);
 
 #endif /* !IN_RC */
@@ -2145 +2145 @@
  *                              than zero.
  */
-RTDECL(int) RTLogGetFlags(PRTLOGGER pLogger, char *pszBuf, size_t cchBuf)
+RTDECL(int) RTLogQueryFlags(PRTLOGGER pLogger, char *pszBuf, size_t cchBuf)
 {
     bool        fNotFirst = false;
@@ -2195 +2195 @@
     return rc;
 }
-RT_EXPORT_SYMBOL(RTLogGetFlags);
+RT_EXPORT_SYMBOL(RTLogQueryFlags);
 
 
@@ -2500 +2500 @@
  *                              than 0.
  */
-RTDECL(int) RTLogGetDestinations(PRTLOGGER pLogger, char *pszBuf, size_t cchBuf)
+RTDECL(int) RTLogQueryDestinations(PRTLOGGER pLogger, char *pszBuf, size_t cchBuf)
 {
     bool        fNotFirst = false;
@@ -2601 +2601 @@
     return VINF_SUCCESS;
 }
-RT_EXPORT_SYMBOL(RTLogGetDestinations);
+RT_EXPORT_SYMBOL(RTLogQueryDestinations);
 
 #endif /* !IN_RC */