Changeset 40938 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Apr 16, 2012 11:58:26 AM (13 years ago)

Author:

vboxsync

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

77489

Message:

runtime: backed out r77481,r77482,r77483,r77484,r77485

Location:

trunk/src/VBox/Runtime/common

Files:

• alloc/heapoffset.cpp (modified) (3 diffs)
• alloc/heapsimple.cpp (modified) (6 diffs)
• log/log.cpp (modified) (9 diffs)
• log/logrel.cpp (modified) (1 diff)
• misc/handletable.cpp (modified) (2 diffs)
• misc/handletable.h (modified) (2 diffs)
• misc/handletablectx.cpp (modified) (1 diff)
• misc/handletablesimple.cpp (modified) (1 diff)
• misc/term.cpp (modified) (3 diffs)
• misc/thread.cpp (modified) (5 diffs)
• path/RTPathAbsDup.cpp (modified) (1 diff)
• path/RTPathAbsExDup.cpp (modified) (1 diff)
• path/RTPathExt.cpp (modified) (4 diffs)
• path/RTPathFilename.cpp (modified) (1 diff)
• path/RTPathParse.cpp (modified) (1 diff)
• path/RTPathRealDup.cpp (modified) (1 diff)
• path/RTPathStripExt.cpp (modified) (2 diffs)
• path/RTPathStripFilename.cpp (modified) (1 diff)
• rand/randparkmiller.cpp (modified) (1 diff)
• string/straprintf.cpp (modified) (3 diffs)
• string/strformat.cpp (modified) (1 diff)
• string/strformatrt.cpp (modified) (18 diffs)
• string/stringalloc.cpp (modified) (1 diff)
• string/strpbrk.cpp (modified) (1 diff)
• string/strprintf.cpp (modified) (1 diff)
• string/strtonum.cpp (modified) (8 diffs)
• string/utf-16.cpp (modified) (6 diffs)
• string/utf-8.cpp (modified) (12 diffs)
• table/avl_Base.cpp.h (modified) (2 diffs)
• table/avl_Get.cpp.h (modified) (2 diffs)
• table/avl_GetBestFit.cpp.h (modified) (1 diff)
• time/time.cpp (modified) (7 diffs)

trunk/src/VBox/Runtime/common/alloc/heapoffset.cpp

@@ -508 +508 @@
 static PRTHEAPOFFSETBLOCK rtHeapOffsetAllocBlock(PRTHEAPOFFSETINTERNAL pHeapInt, size_t cb, size_t uAlignment)
 {
-    PRTHEAPOFFSETBLOCK  pRet = (PRTHEAPOFFSETBLOCK)NULL;
+    PRTHEAPOFFSETBLOCK  pRet = NULL;
     PRTHEAPOFFSETFREE   pFree;
 
-    AssertReturn((pHeapInt)->u32Magic == RTHEAPOFFSET_MAGIC, (PRTHEAPOFFSETBLOCK)NULL);
+    AssertReturn((pHeapInt)->u32Magic == RTHEAPOFFSET_MAGIC, NULL);
 #ifdef RTHEAPOFFSET_STRICT
     rtHeapOffsetAssertAll(pHeapInt);
@@ -704 +704 @@
      * of us (both lists are sorted by address).
      */
-    pLeft = (PRTHEAPOFFSETFREE)NULL;
-    pRight = (PRTHEAPOFFSETFREE)NULL;
+    pLeft = NULL;
+    pRight = NULL;
     if (pHeapInt->offFreeTail)
     {
@@ -814 +814 @@
 static void rtHeapOffsetAssertAll(PRTHEAPOFFSETINTERNAL pHeapInt)
 {
-    PRTHEAPOFFSETFREE pPrev = (PRTHEAPOFFSETFREE)NULL;
-    PRTHEAPOFFSETFREE pPrevFree = (PRTHEAPOFFSETFREE)NULL;
+    PRTHEAPOFFSETFREE pPrev = NULL;
+    PRTHEAPOFFSETFREE pPrevFree = NULL;
     PRTHEAPOFFSETFREE pBlock;
     for (pBlock = (PRTHEAPOFFSETFREE)(pHeapInt + 1);

trunk/src/VBox/Runtime/common/alloc/heapsimple.cpp

@@ -318 +318 @@
     /* Init the single free block. */
     pFree = pHeapInt->pFreeHead;
-    pFree->Core.pNext = (PRTHEAPSIMPLEBLOCK)NULL;
-    pFree->Core.pPrev = (PRTHEAPSIMPLEBLOCK)NULL;
+    pFree->Core.pNext = NULL;
+    pFree->Core.pPrev = NULL;
     pFree->Core.pHeap = pHeapInt;
     pFree->Core.fFlags = RTHEAPSIMPLEBLOCK_FLAGS_MAGIC | RTHEAPSIMPLEBLOCK_FLAGS_FREE;
-    pFree->pNext = (PRTHEAPSIMPLEFREE)NULL;
-    pFree->pPrev = (PRTHEAPSIMPLEFREE)NULL;
+    pFree->pNext = NULL;
+    pFree->pPrev = NULL;
     pFree->cb = pHeapInt->cbFree;
 
@@ -476 +476 @@
 static PRTHEAPSIMPLEBLOCK rtHeapSimpleAllocBlock(PRTHEAPSIMPLEINTERNAL pHeapInt, size_t cb, size_t uAlignment)
 {
-    PRTHEAPSIMPLEBLOCK  pRet = (PRTHEAPSIMPLEBLOCK)NULL;
+    PRTHEAPSIMPLEBLOCK  pRet = NULL;
     PRTHEAPSIMPLEFREE   pFree;
 
@@ -533 +533 @@
                 pPrev = (PRTHEAPSIMPLEBLOCK)(pHeapInt + 1);
                 Assert(pPrev == &pFree->Core);
-                pPrev->pPrev = (PRTHEAPSIMPLEBLOCK)NULL;
+                pPrev->pPrev = NULL;
                 pPrev->pNext = &pFree->Core;
                 pPrev->pHeap = pHeapInt;
@@ -696 +696 @@
      * of us (both lists are sorted by address).
      */
-    pLeft = (PRTHEAPSIMPLEFREE)NULL;
-    pRight = (PRTHEAPSIMPLEFREE)NULL;
+    pLeft = NULL;
+    pRight = NULL;
     if (pHeapInt->pFreeTail)
     {
@@ -728 +728 @@
         Assert(pRight == pHeapInt->pFreeHead);
         pFree->Core.fFlags |= RTHEAPSIMPLEBLOCK_FLAGS_FREE;
-        pFree->pPrev = (PRTHEAPSIMPLEFREE)NULL;
+        pFree->pPrev = NULL;
         pFree->pNext = pRight;
         if (pRight)
@@ -806 +806 @@
 static void rtHeapSimpleAssertAll(PRTHEAPSIMPLEINTERNAL pHeapInt)
 {
-    PRTHEAPSIMPLEFREE pPrev = (PRTHEAPSIMPLEFREE)NULL;
-    PRTHEAPSIMPLEFREE pPrevFree = (PRTHEAPSIMPLEFREE)NULL;
+    PRTHEAPSIMPLEFREE pPrev = NULL;
+    PRTHEAPSIMPLEFREE pPrevFree = NULL;
     PRTHEAPSIMPLEFREE pBlock;
     for (pBlock = (PRTHEAPSIMPLEFREE)(pHeapInt + 1);

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

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

trunk/src/VBox/Runtime/common/misc/handletable.cpp

@@ -93 +93 @@
         pThis->papvLevel1 = (void **)((uint8_t *)pThis + RT_ALIGN(sizeof(*pThis), sizeof(void *)));
     else
-        pThis->papvLevel1 = (void **)NULL;
+        pThis->papvLevel1 = NULL;
     pThis->pfnRetain = pfnRetain;
     pThis->pvRetainUser = pvUser;
@@ -119 +119 @@
 RTDECL(int) RTHandleTableCreate(PRTHANDLETABLE phHandleTable)
 {
-    return RTHandleTableCreateEx(phHandleTable, RTHANDLETABLE_FLAGS_LOCKED, 1, 65534, (PFNRTHANDLETABLERETAIN)NULL, NULL);
+    return RTHandleTableCreateEx(phHandleTable, RTHANDLETABLE_FLAGS_LOCKED, 1, 65534, NULL, NULL);
 }
 RT_EXPORT_SYMBOL(RTHandleTableCreate);

trunk/src/VBox/Runtime/common/misc/handletable.h

@@ -166 +166 @@
             return &paTable[i % RTHT_LEVEL2_ENTRIES];
     }
-    return (PRTHTENTRY)NULL;
+    return NULL;
 }
 
@@ -198 +198 @@
             return &paTable[i % RTHT_LEVEL2_ENTRIES];
     }
-    return (PRTHTENTRYCTX)NULL;
+    return NULL;
 }
 

trunk/src/VBox/Runtime/common/misc/handletablectx.cpp

@@ -121 +121 @@
              */
             rc = VERR_TRY_AGAIN;
-            papvLevel1 = (void **)NULL;
+            papvLevel1 = NULL;
             if (cLevel1)
             {

trunk/src/VBox/Runtime/common/misc/handletablesimple.cpp

@@ -113 +113 @@
              */
             rc = VERR_TRY_AGAIN;
-            void **papvLevel1 = (void **)NULL;
+            void **papvLevel1 = NULL;
             if (cLevel1)
             {

trunk/src/VBox/Runtime/common/misc/term.cpp

@@ -69 +69 @@
 static uint32_t             g_cCallbacks = 0;
 /** The callback head. */
-static PRTTERMCALLBACKREC   g_pCallbackHead = (PRTTERMCALLBACKREC)NULL;
+static PRTTERMCALLBACKREC   g_pCallbackHead = NULL;
 
 
@@ -161 +161 @@
          * Search for the specified pfnCallback/pvUser pair.
          */
-        PRTTERMCALLBACKREC pPrev = (PRTTERMCALLBACKREC)NULL;
+        PRTTERMCALLBACKREC pPrev = NULL;
         PRTTERMCALLBACKREC pCur  = g_pCallbackHead;
         while (pCur)
@@ -175 +175 @@
                 RTSemFastMutexRelease(hFastMutex);
 
-                pCur->pfnCallback = (PFNRTTERMCALLBACK)NULL;
+                pCur->pfnCallback = NULL;
                 RTMemFree(pCur);
                 return VINF_SUCCESS;

trunk/src/VBox/Runtime/common/misc/thread.cpp

@@ -385 +385 @@
         RTMemFree(pThread);
     }
-    return (PRTTHREADINT)NULL;
+    return NULL;
 }
 
@@ -538 +538 @@
 
     AssertMsgFailed(("Thread=%RTthrd\n", Thread));
-    return (PRTTHREADINT)NULL;
+    return NULL;
 }
 
@@ -906 +906 @@
         }
     }
-    return (char *)NULL;
+    return NULL;
 }
 RT_EXPORT_SYMBOL(RTThreadSelfName);
@@ -922 +922 @@
     PRTTHREADINT pThread;
     if (Thread == NIL_RTTHREAD)
-        return (char *)NULL;
+        return NULL;
     pThread = rtThreadGet(Thread);
     if (pThread)
@@ -930 +930 @@
         return szName;
     }
-    return (char *)NULL;
+    return NULL;
 }
 RT_EXPORT_SYMBOL(RTThreadGetName);

trunk/src/VBox/Runtime/common/path/RTPathAbsDup.cpp

@@ -49 +49 @@
     if (RT_SUCCESS(rc))
         return RTStrDup(szPath);
-    return (char *)NULL;
+    return NULL;
 }
 

trunk/src/VBox/Runtime/common/path/RTPathAbsExDup.cpp

@@ -53 +53 @@
     if (RT_SUCCESS(rc))
         return RTStrDup(szPath);
-    return (char *)NULL;
+    return NULL;
 }
 

trunk/src/VBox/Runtime/common/path/RTPathExt.cpp

@@ -43 +43 @@
 {
     const char *psz = pszPath;
-    const char *pszExt = (char *)NULL;
+    const char *pszExt = NULL;
 
     for (;; psz++)
@@ -52 +52 @@
 #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
             case ':':
-                pszExt = (char *)NULL;
+                pszExt = NULL;
                 break;
 
@@ -58 +58 @@
 #endif
             case '/':
-                pszExt = (char *)NULL;
+                pszExt = NULL;
                 break;
             case '.':
@@ -68 +68 @@
                 if (pszExt)
                     return (char *)(void *)pszExt;
-                return (char *)NULL;
+                return NULL;
         }
     }
 
     /* will never get here */
-    return (char *)NULL;
+    return NULL;
 }
 

trunk/src/VBox/Runtime/common/path/RTPathFilename.cpp

@@ -67 +67 @@
                 if (*pszName)
                     return (char *)(void *)pszName;
-                return (char *)NULL;
+                return NULL;
         }
     }

trunk/src/VBox/Runtime/common/path/RTPathParse.cpp

@@ -56 +56 @@
     ssize_t     offRoot = 0;
     const char *pszName = pszPath;
-    const char *pszLastDot = (char *)NULL;
+    const char *pszLastDot = NULL;
 
     for (;; psz++)

trunk/src/VBox/Runtime/common/path/RTPathRealDup.cpp

@@ -50 +50 @@
     if (RT_SUCCESS(rc))
         return RTStrDup(szPath);
-    return (char *)NULL;
+    return NULL;
 }
 

trunk/src/VBox/Runtime/common/path/RTPathStripExt.cpp

@@ -42 +42 @@
 RTDECL(void) RTPathStripExt(char *pszPath)
 {
-    char *pszDot = (char *)NULL;
+    char *pszDot = NULL;
     for (;; pszPath++)
     {
@@ -53 +53 @@
 #endif
             case '/':
-                pszDot = (char *)NULL;
+                pszDot = NULL;
                 break;
             case '.':

trunk/src/VBox/Runtime/common/path/RTPathStripFilename.cpp

@@ -44 +44 @@
 {
     char *psz = pszPath;
-    char *pszLastSep = (char *)NULL;
+    char *pszLastSep = NULL;
 
 

trunk/src/VBox/Runtime/common/rand/randparkmiller.cpp

@@ -152 +152 @@
 
     /* u32Ctx */
-    char *pszNext = (char *)NULL;
+    char *pszNext = NULL;
     uint32_t u32Ctx;
     int rc = RTStrToUInt32Ex(pszState, &pszNext, 16, &u32Ctx);

trunk/src/VBox/Runtime/common/string/straprintf.cpp

@@ -132 +132 @@
 
         /* failure */
-        pArg->psz = (char *)NULL;
+        pArg->psz = NULL;
     }
     return 0;
@@ -153 +153 @@
     Arg.pszTag      = pszTag;
     szBuf[0] = '\0';
-    int cbRet = (int)RTStrFormatV(strallocoutput, &Arg, (PFNSTRFORMAT)NULL, NULL, pszFormat, args);
+    int cbRet = (int)RTStrFormatV(strallocoutput, &Arg, NULL, NULL, pszFormat, args);
     if (Arg.psz)
     {
@@ -175 +175 @@
     {
         /* allocation error */
-        *ppszBuffer = (char *)NULL;
+        *ppszBuffer = NULL;
         cbRet = -1;
 

trunk/src/VBox/Runtime/common/string/strformat.cpp

@@ -782 +782 @@
 
     /* terminate the output */
-    pfnOutput(pvArgOutput, (const char *)NULL, 0);
+    pfnOutput(pvArgOutput, NULL, 0);
 
     return cch;

trunk/src/VBox/Runtime/common/string/strformatrt.cpp

@@ -346 +346 @@
                             return pfnOutput(pvArgOutput, s_szFalse, sizeof(s_szFalse) - 1);
                         /* invalid boolean value */
-                        return RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0, "!%lld!", u.u64);
+                        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "!%lld!", u.u64);
                     }
 
@@ -384 +384 @@
 
                     case RTSF_IPV4:
-                        return RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0,
+                        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
                                            "%u.%u.%u.%u",
                                            u.Ipv4Addr.au8[0],
@@ -394 +394 @@
                     {
                         if (VALID_PTR(u.pIpv6Addr))
-                            return RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0,
+                            return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
                                                "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
                                                u.pIpv6Addr->au8[0],
@@ -418 +418 @@
                     {
                         if (VALID_PTR(u.pMac))
-                            return RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0,
+                            return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
                                                "%02x:%02x:%02x:%02x:%02x:%02x",
                                                u.pMac->au8[0],
@@ -437 +437 @@
                                 case RTNETADDRTYPE_IPV4:
                                     if (u.pNetAddr->uPort == RTNETADDR_PORT_NA)
-                                        return RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0,
+                                        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
                                                            "%u.%u.%u.%u",
                                                            u.pNetAddr->uAddr.IPv4.au8[0],
@@ -443 +443 @@
                                                            u.pNetAddr->uAddr.IPv4.au8[2],
                                                            u.pNetAddr->uAddr.IPv4.au8[3]);
-                                    return RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0,
+                                    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
                                                        "%u.%u.%u.%u:%u",
                                                        u.pNetAddr->uAddr.IPv4.au8[0],
@@ -453 +453 @@
                                 case RTNETADDRTYPE_IPV6:
                                     if (u.pNetAddr->uPort == RTNETADDR_PORT_NA)
-                                        return RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0,
+                                        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
                                                            "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
                                                            u.pNetAddr->uAddr.IPv6.au8[0],
@@ -471 +471 @@
                                                            u.pNetAddr->uAddr.IPv6.au8[14],
                                                            u.pNetAddr->uAddr.IPv6.au8[15]);
-                                    return RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0,
+                                    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
                                                        "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x %u",
                                                        u.pNetAddr->uAddr.IPv6.au8[0],
@@ -492 +492 @@
 
                                 case RTNETADDRTYPE_MAC:
-                                    return RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0,
+                                    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
                                                        "%02x:%02x:%02x:%02x:%02x:%02x",
                                                        u.pNetAddr->uAddr.Mac.au8[0],
@@ -502 +502 @@
 
                                 default:
-                                    return RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0,
+                                    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
                                                        "unsupported-netaddr-type=%u", u.pNetAddr->enmType);
 
@@ -515 +515 @@
                         {
                             /* cannot call RTUuidToStr because of GC/R0. */
-                            return RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0,
+                            return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
                                                "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
                                                u.pUuid->Gen.u32TimeLow,
@@ -664 +664 @@
                                     {
                                         int i;
-                                        cch += RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0, "%s%0*x %04x:", off ? "\n" : "", sizeof(pu8) * 2, (uintptr_t)pu8, off);
+                                        cch += RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "%s%0*x %04x:", off ? "\n" : "", sizeof(pu8) * 2, (uintptr_t)pu8, off);
                                         for (i = 0; i < cchWidth && off + i < cchPrecision ; i++)
-                                            cch += RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0,
+                                            cch += RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
                                                                off + i < cchPrecision ? !(i & 7) && i ? "-%02x" : " %02x" : "   ", pu8[i]);
                                         while (i++ < cchWidth)
@@ -693 +693 @@
                                     if (cchPrecision-- > 0)
                                     {
-                                        cch = RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0, "%02x", *pu8++);
+                                        cch = RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "%02x", *pu8++);
                                         for (; cchPrecision > 0; cchPrecision--, pu8++)
-                                            cch += RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0, " %02x", *pu8);
+                                            cch += RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, " %02x", *pu8);
                                         return cch;
                                     }
@@ -728 +728 @@
                                 return pfnOutput(pvArgOutput, pMsg->pszMsgFull,strlen(pMsg->pszMsgFull));
                             case 'a':
-                                return RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0, "%s (0x%08X) - %s", pMsg->pszDefine, hrc, pMsg->pszMsgFull);
+                                return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "%s (0x%08X) - %s", pMsg->pszDefine, hrc, pMsg->pszMsgFull);
                             default:
                                 AssertMsgFailed(("Invalid status code format type '%.10s'!\n", pszFormatOrg));
@@ -762 +762 @@
                         return pfnOutput(pvArgOutput, pMsg->pszMsgFull,   strlen(pMsg->pszMsgFull));
                     case 'a':
-                        return RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0, "%s (%d) - %s", pMsg->pszDefine, rc, pMsg->pszMsgFull);
+                        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "%s (%d) - %s", pMsg->pszDefine, rc, pMsg->pszMsgFull);
                     default:
                         AssertMsgFailed(("Invalid status code format type '%.10s'!\n", pszFormatOrg));
@@ -774 +774 @@
                     case 'f':
                     case 'a':
-                        return RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0, "%d", rc);
+                        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "%d", rc);
                     default:
                         AssertMsgFailed(("Invalid status code format type '%.10s'!\n", pszFormatOrg));
@@ -801 +801 @@
                         return pfnOutput(pvArgOutput, pMsg->pszMsgFull,strlen(pMsg->pszMsgFull));
                     case 'a':
-                        return RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0, "%s (0x%08X) - %s", pMsg->pszDefine, rc, pMsg->pszMsgFull);
+                        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "%s (0x%08X) - %s", pMsg->pszDefine, rc, pMsg->pszMsgFull);
 # else
                     case 'c':
                     case 'f':
                     case 'a':
-                        return RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, 0, "0x%08X", rc);
+                        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "0x%08X", rc);
 # endif
                     default:
@@ -911 +911 @@
                 {
                     case RTST_TIMESPEC:
-                        return RTStrFormat(pfnOutput, pvArgOutput, (PFNSTRFORMAT)NULL, NULL, "%'lld ns", RTTimeSpecGetNano(u.pTimeSpec));
+                        return RTStrFormat(pfnOutput, pvArgOutput, NULL, NULL, "%'lld ns", RTTimeSpecGetNano(u.pTimeSpec));
 
                     default:

trunk/src/VBox/Runtime/common/string/stringalloc.cpp

@@ -71 +71 @@
     {
         RTMemFree(pszOld);
-        *ppsz = (char *)NULL;
+        *ppsz = NULL;
     }
     else if (pszOld)

trunk/src/VBox/Runtime/common/string/strpbrk.cpp

@@ -60 +60 @@
 
     }
-    return (char *)NULL;
+    return NULL;
 }
 

trunk/src/VBox/Runtime/common/string/strprintf.cpp

@@ -100 +100 @@
 RTDECL(size_t) RTStrPrintfV(char *pszBuffer, size_t cchBuffer, const char *pszFormat, va_list args)
 {
-    return RTStrPrintfExV((PFNSTRFORMAT)NULL, NULL, pszBuffer, cchBuffer, pszFormat, args);
+    return RTStrPrintfExV(NULL, NULL, pszBuffer, cchBuffer, pszFormat, args);
 }
 RT_EXPORT_SYMBOL(RTStrPrintfV);

trunk/src/VBox/Runtime/common/string/strtonum.cpp

@@ -261 +261 @@
 {
     uint64_t u64;
-    int rc = RTStrToUInt64Ex(pszValue, (char **)NULL, 0, &u64);
+    int rc = RTStrToUInt64Ex(pszValue, NULL, 0, &u64);
     if (RT_SUCCESS(rc))
         return u64;
@@ -348 +348 @@
 {
     uint32_t u32;
-    int rc = RTStrToUInt32Ex(pszValue, (char **)NULL, 0, &u32);
+    int rc = RTStrToUInt32Ex(pszValue, NULL, 0, &u32);
     if (RT_SUCCESS(rc))
         return u32;
@@ -435 +435 @@
 {
     uint16_t u16;
-    int rc = RTStrToUInt16Ex(pszValue, (char **)NULL, 0, &u16);
+    int rc = RTStrToUInt16Ex(pszValue, NULL, 0, &u16);
     if (RT_SUCCESS(rc))
         return u16;
@@ -522 +522 @@
 {
     uint8_t u8;
-    int rc = RTStrToUInt8Ex(pszValue, (char **)NULL, 0, &u8);
+    int rc = RTStrToUInt8Ex(pszValue, NULL, 0, &u8);
     if (RT_SUCCESS(rc))
         return u8;
@@ -701 +701 @@
 {
     int64_t i64;
-    int rc = RTStrToInt64Ex(pszValue, (char **)NULL, 0, &i64);
+    int rc = RTStrToInt64Ex(pszValue, NULL, 0, &i64);
     if (RT_SUCCESS(rc))
         return i64;
@@ -788 +788 @@
 {
     int32_t i32;
-    int rc = RTStrToInt32Ex(pszValue, (char **)NULL, 0, &i32);
+    int rc = RTStrToInt32Ex(pszValue, NULL, 0, &i32);
     if (RT_SUCCESS(rc))
         return i32;
@@ -875 +875 @@
 {
     int16_t i16;
-    int rc = RTStrToInt16Ex(pszValue, (char **)NULL, 0, &i16);
+    int rc = RTStrToInt16Ex(pszValue, NULL, 0, &i16);
     if (RT_SUCCESS(rc))
         return i16;
@@ -962 +962 @@
 {
     int8_t i8;
-    int rc = RTStrToInt8Ex(pszValue, (char **)NULL, 0, &i8);
+    int rc = RTStrToInt8Ex(pszValue, NULL, 0, &i8);
     if (RT_SUCCESS(rc))
         return i8;

trunk/src/VBox/Runtime/common/string/utf-16.cpp

@@ -464 +464 @@
     Assert(VALID_PTR(ppszString));
     Assert(VALID_PTR(pwszString));
-    *ppszString = (char *)NULL;
+    *ppszString = NULL;
 
     /*
@@ -529 +529 @@
         else
         {
-            *ppsz = (char *)NULL;
+            *ppsz = NULL;
             fShouldFree = true;
             cch = RT_MAX(cch, cchResult + 1);
@@ -824 +824 @@
     Assert(VALID_PTR(ppszString));
     Assert(VALID_PTR(pwszString));
-    *ppszString = (char *)NULL;
+    *ppszString = NULL;
 
     /*
@@ -889 +889 @@
         else
         {
-            *ppsz = (char *)NULL;
+            *ppsz = NULL;
             fShouldFree = true;
             cch = RT_MAX(cch, cchResult + 1);
@@ -1003 +1003 @@
     Assert(VALID_PTR(ppwszString));
     Assert(VALID_PTR(pszString));
-    *ppwszString = (PRTUTF16)NULL;
+    *ppwszString = NULL;
 
     /*
@@ -1071 +1071 @@
         else
         {
-            *ppwsz = (PRTUTF16)NULL;
+            *ppwsz = NULL;
             fShouldFree = true;
             cwc = RT_MAX(cwcResult + 1, cwc);

trunk/src/VBox/Runtime/common/string/utf-8.cpp

@@ -275 +275 @@
 {
     size_t cCodePoints;
-    int rc = rtUtf8Length(psz, RTSTR_MAX, &cCodePoints, (size_t *)NULL);
+    int rc = rtUtf8Length(psz, RTSTR_MAX, &cCodePoints, NULL);
     return RT_SUCCESS(rc) ? cCodePoints : 0;
 }
@@ -284 +284 @@
 {
     size_t cCodePoints;
-    int rc = rtUtf8Length(psz, cch, &cCodePoints, (size_t *)NULL);
+    int rc = rtUtf8Length(psz, cch, &cCodePoints, NULL);
     if (pcCps)
         *pcCps = RT_SUCCESS(rc) ? cCodePoints : 0;
@@ -390 +390 @@
     Assert(VALID_PTR(pszString));
     Assert(VALID_PTR(ppaCps));
-    *ppaCps = (PRTUNICP)NULL;
+    *ppaCps = NULL;
 
     /*
@@ -396 +396 @@
      */
     size_t cCps;
-    int rc = rtUtf8Length(pszString, RTSTR_MAX, &cCps, (size_t *)NULL);
+    int rc = rtUtf8Length(pszString, RTSTR_MAX, &cCps, NULL);
     if (RT_SUCCESS(rc))
     {
@@ -437 +437 @@
      */
     size_t cCpsResult;
-    int rc = rtUtf8Length(pszString, cchString, &cCpsResult, (size_t *)NULL);
+    int rc = rtUtf8Length(pszString, cchString, &cCpsResult, NULL);
     if (RT_SUCCESS(rc))
     {
@@ -457 +457 @@
         else
         {
-            *ppaCps = (PRTUNICP)NULL;
+            *ppaCps = NULL;
             fShouldFree = true;
             cCps = RT_MAX(cCpsResult + 1, cCps);
@@ -711 +711 @@
     Assert(VALID_PTR(ppwszString));
     Assert(VALID_PTR(pszString));
-    *ppwszString = (PRTUTF16)NULL;
+    *ppwszString = NULL;
 
     /*
@@ -779 +779 @@
         else
         {
-            *ppwsz = (PRTUTF16)NULL;
+            *ppwsz = NULL;
             fShouldFree = true;
             cwc = RT_MAX(cwcResult + 1, cwc);
@@ -901 +901 @@
     Assert(VALID_PTR(ppszString));
     Assert(VALID_PTR(pszString));
-    *ppszString = (char *)NULL;
+    *ppszString = NULL;
 
     /*
@@ -966 +966 @@
         else
         {
-            *ppsz = (char *)NULL;
+            *ppsz = NULL;
             fShouldFree = true;
             cch = RT_MAX(cch, cchResult + 1);
@@ -1094 +1094 @@
     Assert(VALID_PTR(ppszString));
     Assert(VALID_PTR(pszString));
-    *ppszString = (char *)NULL;
+    *ppszString = NULL;
 
     /*
@@ -1162 +1162 @@
         else
         {
-            *ppsz = (char *)NULL;
+            *ppsz = NULL;
             fShouldFree = true;
             cch = RT_MAX(cchResult + 1, cch);

trunk/src/VBox/Runtime/common/table/avl_Base.cpp.h

@@ -118 +118 @@
 #  define KAVL_NULL     0
 # else
-#  define KAVL_NULL     ((PKAVLNODECORE)0)
+#  define KAVL_NULL     NULL
 # endif
 #endif
@@ -410 +410 @@
             pDeleteNode = KAVL_GET_POINTER(ppDeleteNode);
         else
-            return KAVL_NULL;
+            return NULL;
 
         kASSERT(AVLStack.cEntries < KAVL_MAX_STACK);

trunk/src/VBox/Runtime/common/table/avl_Get.cpp.h

@@ -49 +49 @@
                     pNode = KAVL_GET_POINTER(&pNode->pLeft);
                 else
-                    return KAVL_NULL;
+                    return NULL;
             }
             else
@@ -56 +56 @@
                     pNode = KAVL_GET_POINTER(&pNode->pRight);
                 else
-                    return KAVL_NULL;
+                    return NULL;
             }
         }

trunk/src/VBox/Runtime/common/table/avl_GetBestFit.cpp.h

@@ -47 +47 @@
     if (pNode)
     {
-        PKAVLNODECORE           pNodeLast = KAVL_NULL;
+        PKAVLNODECORE           pNodeLast = NULL;
         if (fAbove)
         {   /* pNode->Key >= Key */

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

@@ -383 +383 @@
      * Validate input.
      */
-    AssertReturn(VALID_PTR(pTimeSpec), (PRTTIMESPEC)NULL);
-    AssertReturn(VALID_PTR(pTime), (PRTTIMESPEC)NULL);
-    AssertReturn(pTime->u32Nanosecond < 1000000000, (PRTTIMESPEC)NULL);
-    AssertReturn(pTime->u8Second < 60, (PRTTIMESPEC)NULL);
-    AssertReturn(pTime->u8Minute < 60, (PRTTIMESPEC)NULL);
-    AssertReturn(pTime->u8Hour < 24, (PRTTIMESPEC)NULL);
-    AssertReturn(pTime->u16YearDay >= 1, (PRTTIMESPEC)NULL);
-    AssertReturn(pTime->u16YearDay <= (rtTimeIsLeapYear(pTime->i32Year) ? 366 : 365), (PRTTIMESPEC)NULL);
-    AssertMsgReturn(pTime->i32Year <= RTTIME_MAX_YEAR && pTime->i32Year >= RTTIME_MIN_YEAR, ("%RI32\n", pTime->i32Year), (PRTTIMESPEC)NULL);
+    AssertReturn(VALID_PTR(pTimeSpec), NULL);
+    AssertReturn(VALID_PTR(pTime), NULL);
+    AssertReturn(pTime->u32Nanosecond < 1000000000, NULL);
+    AssertReturn(pTime->u8Second < 60, NULL);
+    AssertReturn(pTime->u8Minute < 60, NULL);
+    AssertReturn(pTime->u8Hour < 24, NULL);
+    AssertReturn(pTime->u16YearDay >= 1, NULL);
+    AssertReturn(pTime->u16YearDay <= (rtTimeIsLeapYear(pTime->i32Year) ? 366 : 365), NULL);
+    AssertMsgReturn(pTime->i32Year <= RTTIME_MAX_YEAR && pTime->i32Year >= RTTIME_MIN_YEAR, ("%RI32\n", pTime->i32Year), NULL);
 
     /*
@@ -398 +398 @@
     i32Days  = g_aoffYear[pTime->i32Year - OFF_YEAR_IDX_0_YEAR]
              + pTime->u16YearDay - 1;
-    AssertMsgReturn(i32Days <= RTTIME_MAX_DAY && i32Days >= RTTIME_MIN_DAY, ("%RI32\n", i32Days), (PRTTIMESPEC)NULL);
+    AssertMsgReturn(i32Days <= RTTIME_MAX_DAY && i32Days >= RTTIME_MIN_DAY, ("%RI32\n", i32Days), NULL);
 
     u32Secs  = pTime->u8Second
@@ -405 +405 @@
     i64Nanos = (uint64_t)pTime->u32Nanosecond
              + u32Secs * UINT64_C(1000000000);
-    AssertMsgReturn(i32Days != RTTIME_MAX_DAY || i64Nanos <= RTTIME_MAX_DAY_NANO, ("%RI64\n", i64Nanos), (PRTTIMESPEC)NULL);
-    AssertMsgReturn(i32Days != RTTIME_MIN_DAY || i64Nanos >= RTTIME_MIN_DAY_NANO, ("%RI64\n", i64Nanos), (PRTTIMESPEC)NULL);
+    AssertMsgReturn(i32Days != RTTIME_MAX_DAY || i64Nanos <= RTTIME_MAX_DAY_NANO, ("%RI64\n", i64Nanos), NULL);
+    AssertMsgReturn(i32Days != RTTIME_MIN_DAY || i64Nanos >= RTTIME_MIN_DAY_NANO, ("%RI64\n", i64Nanos), NULL);
 
     i64Nanos += i32Days * UINT64_C(86400000000000);
@@ -439 +439 @@
                         &&  pTime->u8MonthDay,
                         ("date=%d-%d-%d\n", pTime->i32Year, pTime->u8Month, pTime->u8MonthDay),
-                        (PRTTIME)NULL);
+                        NULL);
         while (pTime->u8Month > 12)
         {
@@ -663 +663 @@
      * Validate that we've got the minimum of stuff handy.
      */
-    AssertReturn(VALID_PTR(pTime), (PRTTIME)NULL);
-    AssertMsgReturn(!(pTime->fFlags & ~RTTIME_FLAGS_MASK), ("%#x\n", pTime->fFlags), (PRTTIME)NULL);
-    AssertMsgReturn((pTime->fFlags & RTTIME_FLAGS_TYPE_MASK) != RTTIME_FLAGS_TYPE_LOCAL, ("Use RTTimeLocalNormalize!\n"), (PRTTIME)NULL);
-    AssertMsgReturn(pTime->offUTC == 0, ("%d; Use RTTimeLocalNormalize!\n", pTime->offUTC), (PRTTIME)NULL);
+    AssertReturn(VALID_PTR(pTime), NULL);
+    AssertMsgReturn(!(pTime->fFlags & ~RTTIME_FLAGS_MASK), ("%#x\n", pTime->fFlags), NULL);
+    AssertMsgReturn((pTime->fFlags & RTTIME_FLAGS_TYPE_MASK) != RTTIME_FLAGS_TYPE_LOCAL, ("Use RTTimeLocalNormalize!\n"), NULL);
+    AssertMsgReturn(pTime->offUTC == 0, ("%d; Use RTTimeLocalNormalize!\n", pTime->offUTC), NULL);
 
     pTime = rtTimeNormalizeInternal(pTime);
@@ -712 +712 @@
         if (    cch <= 15
             ||  psz[cch - 5] != chSign)
-            return (char *)NULL;
+            return NULL;
     }
     else
@@ -721 +721 @@
         if (    cch <= 15
             ||  psz[cch - 1] != 'Z')
-            return (char *)NULL;
+            return NULL;
     }
     return psz;