Changeset 90860 in vbox for trunk/src/VBox

Timestamp:

Aug 24, 2021 9:41:49 PM (3 years ago)

Author:

vboxsync

Message:

IPRT/log: Adjusted RTLogSetFlushCallback so it doesn't upset clang too badly. bugref:10086

File:

• trunk/src/VBox/Runtime/common/log/log.cpp (modified) (2 diffs)

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

@@ -1236 +1236 @@
 RT_EXPORT_SYMBOL(RTLogSetCustomPrefixCallback);
 
-/**
- * Sets the custom prefix callback.
+
+/**
+ * Sets the custom flush callback.
+ *
+ * This can be handy for special loggers like the per-EMT ones in ring-0,
+ * but also for implementing a log viewer in the debugger GUI.
  *
  * @returns IPRT status code.
- * @param   pLogger     The logger instance.
- * @param   pfnCallback The callback.
- * @param   pvUser      The user argument for the callback.
- *  */
-RTDECL(int) RTLogSetFlushCallback(PRTLOGGER pLogger, PFNRTLOGFLUSH pfnFlush, PFNRTLOGFLUSH *ppfnOldFlush)
-{
+ * @retval  VWRN_ALREADY_EXISTS if it was set to a different flusher.
+ * @param   pLogger         The logger instance.
+ * @param   pfnFlush        The flush callback.
+ */
+RTDECL(int) RTLogSetFlushCallback(PRTLOGGER pLogger, PFNRTLOGFLUSH pfnFlush)
+{
+    int rc;
+
     /*
      * Resolve defaults.
@@ -1261 +1267 @@
      * Do the work.
      */
-    rtlogLock(pLoggerInt);
-    if (ppfnOldFlush)
-        *ppfnOldFlush = pLoggerInt->pfnFlush;
-    pLoggerInt->pfnFlush = pfnFlush;
-    rtlogUnlock(pLoggerInt);
-
-    return VINF_SUCCESS;
+    rc = rtlogLock(pLoggerInt);
+    if (RT_SUCCESS(rc))
+    {
+        if (pLoggerInt->pfnFlush && pLoggerInt->pfnFlush != pfnFlush)
+            rc = VWRN_ALREADY_EXISTS;
+        pLoggerInt->pfnFlush = pfnFlush;
+        rtlogUnlock(pLoggerInt);
+    }
+
+    return rc;
 }
 RT_EXPORT_SYMBOL(RTLogSetFlushCallback);