Changeset 69749 in vbox

Timestamp:

Nov 19, 2017 12:49:36 PM (7 years ago)

Author:

vboxsync

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

119149

Message:

Changed RTLogCreateEx[V] to take a RTERRINFO pointer rather than plain char * and size_t. Turned out a several callers didn't actually make use of the error message even.

Location:

trunk

Files:

• include/VBox/com/com.h (modified) (2 diffs)
• include/iprt/log.h (modified) (4 diffs)
• src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp (modified) (3 diffs)
• src/VBox/Additions/common/VBoxService/VBoxService.cpp (modified) (2 diffs)
• src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxBalloonCtrl/VBoxWatchdog.cpp (modified) (3 diffs)
• src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (2 diffs)
• src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp (modified) (2 diffs)
• src/VBox/Main/glue/VBoxLogRelCreate.cpp (modified) (2 diffs)
• src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (2 diffs)
• src/VBox/Main/src-server/win/svcmain.cpp (modified) (2 diffs)
• src/VBox/Main/src-server/xpcom/server.cpp (modified) (2 diffs)
• src/VBox/Main/webservice/vboxweb.cpp (modified) (3 diffs)
• src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/log/log.cpp (modified) (19 diffs)

trunk/include/VBox/com/com.h

@@ -99 +99 @@
  *  @param uHistoryFileTime Maximum amount of time to put in a log file.
  *  @param uHistoryFileSize Maximum size of a log file before rotating.
- *  @param pszError         In case of creation failure: buffer for error message.
- *  @param cbError          Size of error message buffer.
+ *  @param pErrInfo         Where to return extended error information.
+ *                          Optional.
+ *
  *  @return         VBox status code.
  */
@@ -108 +109 @@
                      uint32_t cMaxEntriesPerGroup, uint32_t cHistory,
                      uint32_t uHistoryFileTime, uint64_t uHistoryFileSize,
-                     char *pszError, size_t cbError);
+                     PRTERRINFO pErrInfo);
 
 } /* namespace com */

trunk/include/iprt/log.h

@@ -2020 +2020 @@
  *                              performing history rotation, in seconds.
  *                              0 means time limit.
- * @param   pszErrorMsg         A buffer which is filled with an error message if something fails. May be NULL.
- * @param   cchErrorMsg         The size of the error message buffer.
+ * @param   pErrInfo            Where to return extended error information.
+ *                              Optional.
  * @param   pszFilenameFmt      Log filename format string. Standard RTStrFormat().
  * @param   ...                 Format arguments.
@@ -2028 +2028 @@
                           const char *pszEnvVarBase, unsigned cGroups, const char * const * papszGroups,
                           uint32_t fDestFlags, PFNRTLOGPHASE pfnPhase, uint32_t cHistory,
-                          uint64_t cbHistoryFileMax, uint32_t cSecsHistoryTimeSlot, char *pszErrorMsg, size_t cchErrorMsg,
+                          uint64_t cbHistoryFileMax, uint32_t cSecsHistoryTimeSlot, PRTERRINFO pErrInfo,
                           const char *pszFilenameFmt, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(14, 15);
 
@@ -2057 +2057 @@
  *                              performing history rotation, in seconds.
  *                              0 means no time limit.
- * @param   pszErrorMsg         A buffer which is filled with an error message
- *                              if something fails.  May be NULL.
- * @param   cchErrorMsg         The size of the error message buffer.
+ * @param   pErrInfo            Where to return extended error information.
+ *                              Optional.
  * @param   pszFilenameFmt      Log filename format string.  Standard
  *                              RTStrFormat().
@@ -2067 +2066 @@
                            const char *pszEnvVarBase, unsigned cGroups, const char * const * papszGroups,
                            uint32_t fDestFlags, PFNRTLOGPHASE pfnPhase, uint32_t cHistory,
-                           uint64_t cbHistoryFileMax, uint32_t cSecsHistoryTimeSlot, char *pszErrorMsg, size_t cchErrorMsg,
+                           uint64_t cbHistoryFileMax, uint32_t cSecsHistoryTimeSlot, PRTERRINFO pErrInfo,
                            const char *pszFilenameFmt, va_list args) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(14, 0);
 

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

@@ -559 +559 @@
     fFlags |= RTLOGFLAGS_USECRLF;
 #endif
-    char szError[RTPATH_MAX + 128] = "";
+    RTERRINFOSTATIC ErrInfo;
     int rc = RTLogCreateEx(&g_pLoggerRelease, fFlags,
 #ifdef DEBUG
@@ -570 +570 @@
                            RT_ELEMENTS(s_apszGroups), s_apszGroups, RTLOGDEST_STDOUT,
                            vboxTrayLogHeaderFooter, g_cHistory, g_uHistoryFileSize, g_uHistoryFileTime,
-                           szError, sizeof(szError), pszLogFile);
+                           RTErrInfoInitStatic(&ErrInfo), pszLogFile);
     if (RT_SUCCESS(rc))
     {
@@ -583 +583 @@
     }
     else
-        MessageBox(GetDesktopWindow(),
-                   szError, "VBoxTray - Logging Error", MB_OK | MB_ICONERROR);
+        MessageBoxA(GetDesktopWindow(), ErrInfo.szMsg, "VBoxTray - Logging Error", MB_OK | MB_ICONERROR);
 
     return rc;

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -310 +310 @@
     fFlags |= RTLOGFLAGS_USECRLF;
 #endif
-    char szError[RTPATH_MAX + 128] = "";
     int rc = RTLogCreateEx(&g_pLoggerRelease, fFlags, "all",
 #ifdef DEBUG
@@ -320 +319 @@
                            RTLOGDEST_STDOUT | RTLOGDEST_USER,
                            vgsvcLogHeaderFooter, g_cHistory, g_uHistoryFileSize, g_uHistoryFileTime,
-                           szError, sizeof(szError), pszLogFile);
+                           NULL /*pErrInfo*/, pszLogFile);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp

@@ -936 +936 @@
     fFlags |= RTLOGFLAGS_USECRLF;
 #endif
-    char szError[RTPATH_MAX + 128] = "";
     int rc = RTLogCreateEx(&g_pLoggerRelease, fFlags, "all",
                            "VBOXGREETER_RELEASE_LOG", RT_ELEMENTS(s_apszGroups), s_apszGroups,
                            RTLOGDEST_STDOUT,
                            vboxGreeterLogHeaderFooter, g_cHistory, g_uHistoryFileSize, g_uHistoryFileTime,
-                           szError, sizeof(szError), pszLogFile);
+                           NULL /*pErrInfo*/, pszLogFile);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxWatchdog.cpp

@@ -1099 +1099 @@
 
     /* create release logger, to stdout */
-    char szError[RTPATH_MAX + 128];
+    RTERRINFOSTATIC ErrInfo;
     rc = com::VBoxLogRelCreate("Watchdog", g_fDaemonize ? NULL : pszLogFile,
                                RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG,
@@ -1105 +1105 @@
                                RTLOGDEST_STDOUT, UINT32_MAX /* cMaxEntriesPerGroup */,
                                g_cHistory, g_uHistoryFileTime, g_uHistoryFileSize,
-                               szError, sizeof(szError));
+                               RTErrInfoInitStatic(&ErrInfo));
     if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", szError, rc);
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", ErrInfo.Core.pszMsg, rc);
 
 #if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined (RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
@@ -1135 +1135 @@
                                    RTLOGDEST_FILE, UINT32_MAX /* cMaxEntriesPerGroup */,
                                    g_cHistory, g_uHistoryFileTime, g_uHistoryFileSize,
-                                   szError, sizeof(szError));
+                                   RTErrInfoInitStatic(&ErrInfo));
         if (RT_FAILURE(rc))
-            return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", szError, rc);
+            return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", ErrInfo.Core.pszMsg, rc);
     }
 #endif

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -3859 +3859 @@
         pszLogFile = szLogFile;
         /* Create release logger, to file: */
-        char szError[RTPATH_MAX + 128];
         com::VBoxLogRelCreate("GUI VM Selector Window",
                               pszLogFile,
@@ -3870 +3869 @@
                               60 * 60,
                               _1M,
-                              szError,
-                              sizeof(szError));
+                              NULL /*pErrInfo*/);
 
         LogRel(("Qt version: %s\n", qtRTVersionString().toUtf8().constData()));

trunk/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp

@@ -115 +115 @@
     fFlags |= RTLOGFLAGS_USECRLF;
 #endif
-    char szError[RTPATH_MAX + 128] = "";
     const char * pszFilenameFmt;
     RTLOGDEST enmLogDest;
@@ -135 +134 @@
                             "VBOX_RELEASE_LOG", RT_ELEMENTS(s_apszGroups), s_apszGroups, enmLogDest,
                             NULL /* pfnBeginEnd */, 0 /* cHistory */, 0 /* cbHistoryFileMax */, 0 /* uHistoryTimeMax */,
-                            szError, sizeof(szError), pszFilenameFmt, pszFilename, RTTimeMilliTS());
+                            NULL /* pErrInfo */, pszFilenameFmt, pszFilename, RTTimeMilliTS());
     if (RT_SUCCESS(vrc))
     {

trunk/src/VBox/Main/glue/VBoxLogRelCreate.cpp

@@ -141 +141 @@
                      uint32_t cMaxEntriesPerGroup, uint32_t cHistory,
                      uint32_t uHistoryFileTime, uint64_t uHistoryFileSize,
-                     char *pszError, size_t cbError)
+                     PRTERRINFO pErrInfo)
 {
-    Assert(cbError >= RTPATH_MAX + 128);
-
     /* create release logger */
     PRTLOGGER pReleaseLogger;
@@ -155 +153 @@
                             pcszEnvVarBase, RT_ELEMENTS(s_apszGroups), s_apszGroups, fDestFlags,
                             vboxHeaderFooter, cHistory, uHistoryFileSize, uHistoryFileTime,
-                            pszError, cbError,
-                            pcszLogFile ? "%s" : NULL, pcszLogFile);
+                            pErrInfo, pcszLogFile ? "%s" : NULL, pcszLogFile);
     if (RT_SUCCESS(vrc))
     {

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

@@ -7217 +7217 @@
     }
 
-    char szError[RTPATH_MAX + 128];
+    RTERRINFOSTATIC ErrInfo;
     int vrc = com::VBoxLogRelCreate("VM", logFile.c_str(),
                                     RTLOGFLAGS_PREFIX_TIME_PROG | RTLOGFLAGS_RESTRICT_GROUPS,
@@ -7224 +7224 @@
                                     32768 /* cMaxEntriesPerGroup */,
                                     0 /* cHistory */, 0 /* uHistoryFileTime */,
-                                    0 /* uHistoryFileSize */, szError, sizeof(szError));
+                                    0 /* uHistoryFileSize */, RTErrInfoInitStatic(&ErrInfo));
     if (RT_FAILURE(vrc))
-        hrc = setError(E_FAIL, tr("Failed to open release log (%s, %Rrc)"),
-                       szError, vrc);
+        hrc = setError(E_FAIL, tr("Failed to open release log (%s, %Rrc)"), ErrInfo.Core.pszMsg, vrc);
 
     /* If we've made any directory changes, flush the directory to increase

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

@@ -809 +809 @@
         }
 
-        char szError[RTPATH_MAX + 128];
+        RTERRINFOSTATIC ErrInfo;
         vrc = com::VBoxLogRelCreate("COM Server", pszLogFile,
                                     RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG,
@@ -819 +819 @@
 #endif
                                     UINT32_MAX /* cMaxEntriesPerGroup */, cHistory, uHistoryFileTime, uHistoryFileSize,
-                                    szError, sizeof(szError));
+                                    RTErrInfoInitStatic(&ErrInfo));
         if (RT_FAILURE(vrc))
-            return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", szError, vrc);
+            return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", ErrInfo.Core.pszMsg, vrc);
     }
 

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

@@ -744 +744 @@
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to create logging file name, rc=%Rrc", vrc);
 
-    char szError[RTPATH_MAX + 128];
+    RTERRINFOSTATIC ErrInfo;
     vrc = com::VBoxLogRelCreate("XPCOM Server", szLogFile,
                                 RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG,
@@ -750 +750 @@
                                 RTLOGDEST_FILE, UINT32_MAX /* cMaxEntriesPerGroup */,
                                 cHistory, uHistoryFileTime, uHistoryFileSize,
-                                szError, sizeof(szError));
+                                RTErrInfoInitStatic(&ErrInfo));
     if (RT_FAILURE(vrc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", szError, vrc);
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", ErrInfo.Core.pszMsg, vrc);
 
     /* Set up a build identifier so that it can be seen from core dumps what

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -1209 +1209 @@
 
     /* create release logger, to stdout */
-    char szError[RTPATH_MAX + 128];
+    RTERRINFOSTATIC ErrInfo;
     rc = com::VBoxLogRelCreate("web service", g_fDaemonize ? NULL : pszLogFile,
                                RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG,
@@ -1215 +1215 @@
                                RTLOGDEST_STDOUT, UINT32_MAX /* cMaxEntriesPerGroup */,
                                g_cHistory, g_uHistoryFileTime, g_uHistoryFileSize,
-                               szError, sizeof(szError));
+                               RTErrInfoInitStatic(&ErrInfo));
     if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", szError, rc);
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", ErrInfo.Core.pszMsg, rc);
 
 #if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined (RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
@@ -1246 +1246 @@
                                    RTLOGDEST_FILE, UINT32_MAX /* cMaxEntriesPerGroup */,
                                    g_cHistory, g_uHistoryFileTime, g_uHistoryFileSize,
-                                   szError, sizeof(szError));
+                                   RTErrInfoInitStatic(&ErrInfo));
         if (RT_FAILURE(rc))
-            return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", szError, rc);
+            return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", ErrInfo.Core.pszMsg, rc);
     }
 #endif

trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp

@@ -1325 +1325 @@
         return VERR_BUFFER_OVERFLOW;
 
-    char szError[RTPATH_MAX + 128];
     rc = com::VBoxLogRelCreate("NAT Network",
                                szLogFile,
@@ -1336 +1335 @@
                                0 /* uHistoryFileTime */,
                                0 /* uHistoryFileSize */,
-                               szError, sizeof(szError));
+                               NULL /*pErrInfo*/);
 
     /*

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

@@ -228 +228 @@
 #endif
 #ifdef IN_RING3
-static int  rtR3LogOpenFileDestination(PRTLOGGER pLogger, char *pszErrorMsg, size_t cchErrorMsg);
+static int  rtR3LogOpenFileDestination(PRTLOGGER pLogger, PRTERRINFO pErrInfo);
 #endif
 #ifndef IN_RC
@@ -781 +781 @@
                            uint32_t fDestFlags, PFNRTLOGPHASE pfnPhase, uint32_t cHistory,
                            uint64_t cbHistoryFileMax, uint32_t cSecsHistoryTimeSlot,
-                           char *pszErrorMsg, size_t cchErrorMsg, const char *pszFilenameFmt, va_list args)
+                           PRTERRINFO pErrInfo, const char *pszFilenameFmt, va_list args)
 {
     int         rc;
@@ -791 +791 @@
      * Validate input.
      */
-    if (    (cGroups && !papszGroups)
-        ||  !VALID_PTR(ppLogger) )
+    if (   (cGroups && !papszGroups)
+        || !VALID_PTR(ppLogger) )
     {
         AssertMsgFailed(("Invalid parameters!\n"));
@@ -798 +798 @@
     }
     *ppLogger = NULL;
-
-    if (pszErrorMsg)
-        RTStrPrintf(pszErrorMsg, cchErrorMsg, N_("unknown error"));
 
     AssertMsgReturn(cHistory < _1M, ("%#x", cHistory), VERR_OUT_OF_RANGE);
@@ -882 +879 @@
         else
         {
+            rc = VERR_NO_MEMORY;
 #  ifdef RT_OS_LINUX
-            if (pszErrorMsg) /* Most probably SELinux causing trouble since the larger RTMemAlloc succeeded. */
-                RTStrPrintf(pszErrorMsg, cchErrorMsg, N_("mmap(PROT_WRITE | PROT_EXEC) failed -- SELinux?"));
+                /* Most probably SELinux causing trouble since the larger RTMemAlloc succeeded. */
+            RTErrInfoSet(rc, N_("mmap(PROT_WRITE | PROT_EXEC) failed -- SELinux?"));
 #  endif
-            rc = VERR_NO_MEMORY;
         }
         if (RT_SUCCESS(rc))
@@ -948 +945 @@
 # ifdef IN_RING3
             if ((pLogger->fDestFlags & (RTLOGDEST_FILE | RTLOGDEST_F_DELAY_FILE)) == RTLOGDEST_FILE)
-                rc = rtR3LogOpenFileDestination(pLogger, pszErrorMsg, cchErrorMsg);
+                rc = rtR3LogOpenFileDestination(pLogger, pErrInfo);
 # endif
 
@@ -984 +981 @@
                 }
 
-                if (pszErrorMsg)
-                    RTStrPrintf(pszErrorMsg, cchErrorMsg, N_("failed to create semaphore"));
+                RTErrInfoSet(pErrInfo, rc, N_("failed to create semaphore"));
             }
 # ifdef IN_RING3
@@ -1016 +1012 @@
     rc = RTLogCreateExV(ppLogger, fFlags, pszGroupSettings, pszEnvVarBase, cGroups, papszGroups,
                         fDestFlags, NULL /*pfnPhase*/, 0 /*cHistory*/, 0 /*cbHistoryFileMax*/, 0 /*cSecsHistoryTimeSlot*/,
-                        NULL /*pszErrorMsg*/, 0 /*cchErrorMsg*/, pszFilenameFmt, args);
+                        NULL /*pErrInfo*/, pszFilenameFmt, args);
     va_end(args);
     return rc;
@@ -1027 +1023 @@
                           uint32_t fDestFlags, PFNRTLOGPHASE pfnPhase, uint32_t cHistory,
                           uint64_t cbHistoryFileMax, uint32_t cSecsHistoryTimeSlot,
-                          char *pszErrorMsg, size_t cchErrorMsg, const char *pszFilenameFmt, ...)
+                          PRTERRINFO pErrInfo, const char *pszFilenameFmt, ...)
 {
     va_list args;
@@ -1035 +1031 @@
     rc = RTLogCreateExV(ppLogger, fFlags, pszGroupSettings, pszEnvVarBase, cGroups, papszGroups,
                         fDestFlags, pfnPhase, cHistory, cbHistoryFileMax, cSecsHistoryTimeSlot,
-                        pszErrorMsg, cchErrorMsg, pszFilenameFmt, args);
+                        pErrInfo, pszFilenameFmt, args);
     va_end(args);
     return rc;
@@ -2458 +2454 @@
                 && pLogger->pInt->hFile == NIL_RTFILE)
             {
-                rc = rtR3LogOpenFileDestination(pLogger, NULL, 0);
+                rc = rtR3LogOpenFileDestination(pLogger, pErrInfo);
                 if (RT_SUCCESS(rc))
                     rtlogFlush(pLogger, false /*fNeedSpace*/);
@@ -3174 +3170 @@
  *
  * @param   pLogger         The logger instance to update. NULL is not allowed!
- * @param   pszErrorMsg     A buffer which is filled with an error message if
- *                          something fails.  May be NULL.
- * @param   cchErrorMsg     The size of the error message buffer.
- */
-static int rtlogFileOpen(PRTLOGGER pLogger, char *pszErrorMsg, size_t cchErrorMsg)
+ * @param   pErrInfo        Where to return extended error information.
+ *                          Optional.
+ */
+static int rtlogFileOpen(PRTLOGGER pLogger, PRTERRINFO pErrInfo)
 {
     uint32_t fOpen = RTFILE_O_WRITE | RTFILE_O_DENY_NONE;
@@ -3211 +3206 @@
     {
         pLogger->pInt->hFile = NIL_RTFILE;
-        if (pszErrorMsg)
-            RTStrPrintf(pszErrorMsg, cchErrorMsg, N_("could not open file '%s' (fOpen=%#x)"), pLogger->pInt->szFilename, fOpen);
+        RTErrInfoSetF(pErrInfo, rc, N_("could not open file '%s' (fOpen=%#x)"), pLogger->pInt->szFilename, fOpen);
     }
     return rc;
@@ -3228 +3222 @@
  *                      called from RTLogCreateExV.  Prevents pfnPhase from
  *                      being called.
- */
-static void rtlogRotate(PRTLOGGER pLogger, uint32_t uTimeSlot, bool fFirst)
+ * @param   pErrInfo    Where to return extended error information. Optional.
+ */
+static void rtlogRotate(PRTLOGGER pLogger, uint32_t uTimeSlot, bool fFirst, PRTERRINFO pErrInfo)
 {
     /* Suppress rotating empty log files simply because the time elapsed. */
@@ -3321 +3316 @@
     pLogger->pInt->cbHistoryFileWritten = 0;
     pLogger->pInt->uHistoryTimeSlotStart = uTimeSlot;
-    rtlogFileOpen(pLogger, NULL, 0);
+    rtlogFileOpen(pLogger, pErrInfo);
 
     /*
@@ -3349 +3344 @@
  * @returns IPRT status code.
  * @param   pLogger             The logger.
- * @param   pszErrorMsg         Where to return error info. Optional.
- * @param   cchErrorMsg         Size of @a pszErrorMsg buffer.
- */
-static int rtR3LogOpenFileDestination(PRTLOGGER pLogger, char *pszErrorMsg, size_t cchErrorMsg)
+ * @param   pErrInfo            Where to return extended error information.
+ *                              Optional.
+ */
+static int rtR3LogOpenFileDestination(PRTLOGGER pLogger, PRTERRINFO pErrInfo)
 {
     int rc;
     if (pLogger->fFlags & RTLOGFLAGS_APPEND)
     {
-        rc = rtlogFileOpen(pLogger, pszErrorMsg, cchErrorMsg);
+        rc = rtlogFileOpen(pLogger, pErrInfo);
 
         /* Rotate in case of appending to a too big log file,
            otherwise this simply doesn't do anything. */
-        rtlogRotate(pLogger, 0, true /* fFirst */);
+        rtlogRotate(pLogger, 0, true /* fFirst */, pErrInfo);
     }
     else
@@ -3367 +3362 @@
         /* Force rotation if it is configured. */
         pLogger->pInt->cbHistoryFileWritten = UINT64_MAX;
-        rtlogRotate(pLogger, 0, true /* fFirst */);
+        rtlogRotate(pLogger, 0, true /* fFirst */, pErrInfo);
 
         /* If the file is not open then rotation is not set up. */
@@ -3373 +3368 @@
         {
             pLogger->pInt->cbHistoryFileWritten = 0;
-            rc = rtlogFileOpen(pLogger, pszErrorMsg, cchErrorMsg);
+            rc = rtlogFileOpen(pLogger, pErrInfo);
         }
         else
@@ -3481 +3476 @@
         if (   (pLogger->fDestFlags & RTLOGDEST_FILE)
             && pLogger->pInt->cHistory)
-            rtlogRotate(pLogger, RTTimeProgramSecTS() / pLogger->pInt->cSecsHistoryTimeSlot, false /* fFirst */);
+            rtlogRotate(pLogger, RTTimeProgramSecTS() / pLogger->pInt->cSecsHistoryTimeSlot, false /*fFirst*/, NULL /*pErrInfo*/);
 #endif
     }