Changeset 40933 in vbox

Timestamp:

Apr 16, 2012 4:12:45 AM (12 years ago)

Author:

vboxsync

Message:

Runtime/log: 3.4-rc3 build fix [-fpermissive]

Location:

trunk/src/VBox/Runtime/common/log

Files:

• log.cpp (modified) (9 diffs)
• logrel.cpp (modified) (1 diff)

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

@@ -440 +440 @@
         return VERR_INVALID_PARAMETER;
     }
-    *ppLogger = NULL;
+    *ppLogger = (PRTLOGGER)NULL;
 
     if (pszErrorMsg)
@@ -469 +469 @@
         pLogger->pInt->cbSelf                   = sizeof(RTLOGGERINTERNAL);
         pLogger->pInt->hSpinMtx                 = NIL_RTSEMSPINMUTEX;
-        pLogger->pInt->pfnFlush                 = NULL;
-        pLogger->pInt->pfnPrefix                = NULL;
+        pLogger->pInt->pfnFlush                 = (PFNRTLOGFLUSH)NULL;
+        pLogger->pInt->pfnPrefix                = (PFNRTLOGPREFIX)NULL;
         pLogger->pInt->pvPrefixUserArg          = NULL;
         pLogger->pInt->afPadding1[0]            = false;
@@ -480 +480 @@
             pLogger->pInt->pacEntriesPerGroup   = (uint32_t *)(pLogger->pInt + 1);
         else
-            pLogger->pInt->pacEntriesPerGroup   = NULL;
+            pLogger->pInt->pacEntriesPerGroup   = (uint32_t *)NULL;
         pLogger->pInt->cMaxEntriesPerGroup      = UINT32_MAX;
 # ifdef IN_RING3
@@ -670 +670 @@
     va_start(args, pszFilenameFmt);
     rc = RTLogCreateExV(ppLogger, fFlags, pszGroupSettings, pszEnvVarBase, cGroups, papszGroups,
-                        fDestFlags, NULL /*pfnPhase*/, 0 /*cHistory*/, 0 /*cbHistoryFileMax*/, 0 /*cSecsHistoryTimeSlot*/,
-                        NULL /*pszErrorMsg*/, 0 /*cchErrorMsg*/, pszFilenameFmt, args);
+                        fDestFlags, (PFNRTLOGPHASE)NULL /*pfnPhase*/, 0 /*cHistory*/, 0 /*cbHistoryFileMax*/, 0 /*cSecsHistoryTimeSlot*/,
+                        (char *)NULL /*pszErrorMsg*/, 0 /*cchErrorMsg*/, pszFilenameFmt, args);
     va_end(args);
     return rc;
@@ -779 +779 @@
         RTMemExecFree(*(void **)&pLogger->pfnLogger, 64);
 # endif
-        pLogger->pfnLogger = NULL;
+        pLogger->pfnLogger = (PFNRTLOGGER)NULL;
     }
     RTMemFree(pLogger);
@@ -916 +916 @@
         {
             rtLogOutput(pLogger, pLoggerRC->achScratch, pLoggerRC->offScratch);
-            rtLogOutput(pLogger, NULL, 0);
+            rtLogOutput(pLogger, (char *)NULL, 0);
             pLoggerRC->offScratch = 0;
         }
@@ -1174 +1174 @@
             {
                 rtLogOutput(pDstLogger, pSrcLogger->achScratch, pSrcLogger->offScratch);
-                rtLogOutput(pDstLogger, NULL, 0);
+                rtLogOutput(pDstLogger, (char *)NULL, 0);
                 pSrcLogger->offScratch = 0;
             }
@@ -2586 +2586 @@
 RTDECL(void) RTLogPrintfV(const char *pszFormat, va_list args)
 {
-    RTLogLoggerV(NULL, pszFormat, args);
+    RTLogLoggerV((PRTLOGGER)NULL, pszFormat, args);
 }
 RT_EXPORT_SYMBOL(RTLogPrintfV);
@@ -3188 +3188 @@
                     const char *pszGroup = pArgs->iGroup != ~0U ? pLogger->pInt->papszGroups[pArgs->iGroup] : NULL;
 #else
-                    const char *pszGroup = NULL;
+                    const char *pszGroup = (char *)NULL;
 #endif
                     psz = rtLogStPNCpyPad(psz, pszGroup, 16, 8);

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

@@ -142 +142 @@
 RTDECL(void) RTLogRelPrintfV(const char *pszFormat, va_list args)
 {
-    RTLogRelLoggerV(NULL, 0, ~0U, pszFormat, args);
+    RTLogRelLoggerV((PRTLOGGER)NULL, 0, ~0U, pszFormat, args);
 }
 RT_EXPORT_SYMBOL(RTLogRelPrintfV);