Changeset 7942 in vbox for trunk/src/VBox

Timestamp:

Apr 11, 2008 8:32:20 PM (17 years ago)

Author:

vboxsync

Message:

move variables around to be able to compile this as .c (debug kernel module)

Location:

trunk/src/VBox/Runtime

Files:

• VBox/log-vbox.cpp (modified) (2 diffs)
• common/log/log.cpp (modified) (25 diffs)
• common/log/logcom.cpp (modified) (2 diffs)
• common/string/strprintf.cpp (modified) (4 diffs)
• common/string/strtonum.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/VBox/log-vbox.cpp

@@ -182 +182 @@
      */
     static volatile uint32_t fInitializing = 0;
+    PRTLOGGER pLogger;
+
     if (g_pLogger || !ASMAtomicCmpXchgU32(&fInitializing, 1, 0))
         return g_pLogger;
@@ -282 +284 @@
      * Create the default logging instance.
      */
-    PRTLOGGER pLogger;
 #ifdef IN_RING3
 # ifndef IN_GUEST_R3

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

@@ -182 +182 @@
                            RTUINT fDestFlags, char *pszErrorMsg, size_t cchErrorMsg, const char *pszFilenameFmt, va_list args)
 {
+    int        rc;
+    size_t     cb;
+    PRTLOGGER  pLogger;
+
     /*
      * Validate input.
@@ -200 +204 @@
      * Allocate a logger instance.
      */
-    int         rc;
-    size_t      cb = RT_OFFSETOF(RTLOGGER, afGroups[cGroups + 1]) + RTPATH_MAX;
-    PRTLOGGER   pLogger = (PRTLOGGER)RTMemAllocZ(cb);
+    cb = RT_OFFSETOF(RTLOGGER, afGroups[cGroups + 1]) + RTPATH_MAX;
+    pLogger = (PRTLOGGER)RTMemAllocZ(cb);
     if (pLogger)
     {
+        uint8_t *pu8Code;
+
         pLogger->u32Magic    = RTLOGGER_MAGIC;
         pLogger->papszGroups = papszGroups;
@@ -220 +225 @@
          * Emit wrapper code.
          */
-        uint8_t *pu8Code = (uint8_t *)RTMemExecAlloc(64);
+        pu8Code = (uint8_t *)RTMemExecAlloc(64);
         if (pu8Code)
         {
@@ -511 +516 @@
 RTDECL(int) RTLogDestroy(PRTLOGGER pLogger)
 {
+    int            rc;
+    RTUINT         iGroup;
+    RTSEMFASTMUTEX MutexSem;
+
     /*
      * Validate input.
@@ -520 +529 @@
      * Acquire logger instance sem and disable all logging. (paranoia)
      */
-    int rc = rtlogLock(pLogger);
+    rc = rtlogLock(pLogger);
     if (RT_FAILURE(rc))
         return rc;
 
     pLogger->fFlags |= RTLOGFLAGS_DISABLED;
-    RTUINT iGroup = pLogger->cGroups;
+    iGroup = pLogger->cGroups;
     while (iGroup-- > 0)
         pLogger->afGroups[iGroup] = 0;
@@ -551 +560 @@
      * Free the mutex and the instance memory.
      */
-    RTSEMFASTMUTEX MutexSem = pLogger->MutexSem;
+    MutexSem = pLogger->MutexSem;
     pLogger->MutexSem = NIL_RTSEMFASTMUTEX;
     if (MutexSem != NIL_RTSEMFASTMUTEX)
@@ -760 +769 @@
 RTDECL(int) RTLogCopyGroupsAndFlags(PRTLOGGER pDstLogger, PCRTLOGGER pSrcLogger, unsigned fFlagsOr, unsigned fFlagsAnd)
 {
+    int      rc;
+    unsigned cGroups;
+
     /*
      * Validate input.
@@ -786 +798 @@
     pDstLogger->fFlags = (pSrcLogger->fFlags & fFlagsAnd) | fFlagsOr;
 
-    int rc = VINF_SUCCESS;
-    unsigned cGroups = pSrcLogger->cGroups;
+    rc = VINF_SUCCESS;
+    cGroups = pSrcLogger->cGroups;
     if (cGroups < pDstLogger->cMaxGroups)
     {
@@ -883 +895 @@
 static bool rtlogIsGroupMatching(const char *pszGrp, const char **ppachMask, unsigned cchMask)
 {
+    const char *pachMask;
+
     if (!pszGrp || !*pszGrp)
         return false;
-    const char *pachMask = *ppachMask;
+    pachMask = *ppachMask;
     for (;;)
     {
         if (RT_C_TO_LOWER(*pszGrp) != RT_C_TO_LOWER(*pachMask))
         {
+            const char *pszTmp;
+
             /*
              * Check for wildcard and do a minimal match if found.
@@ -907 +923 @@
 
             /* do extremely minimal matching (fixme) */
-            const char *pszTmp = strchr(pszGrp, RT_C_TO_LOWER(*pachMask));
+            pszTmp = strchr(pszGrp, RT_C_TO_LOWER(*pachMask));
             if (!pszTmp)
                 pszTmp = strchr(pszGrp, RT_C_TO_UPPER(*pachMask));
@@ -974 +990 @@
         bool    fEnabled = true;
         char    ch;
+        const char *pszStart;
+        unsigned i;
+        size_t cch;
+
         while ((ch = *pszVar) == '+' || ch == '-' || ch == ' ' || ch == '\t' || ch == '\n' || ch == ';')
         {
@@ -986 +1006 @@
          * Find end.
          */
-        const char *pszStart = pszVar;
+        pszStart = pszVar;
         while ((ch = *pszVar) != '\0' && ch != '+' && ch != '-' && ch != ' ' && ch != '\t')
             pszVar++;
@@ -994 +1014 @@
          * Special group 'all'.
          */
-        unsigned    i;
-        size_t      cch = pszVar - pszStart;
+        cch = pszVar - pszStart;
         if (    cch >= 3
             &&  (pszStart[0] == 'a' || pszStart[0] == 'A')
@@ -1100 +1119 @@
             { "noname",     RTLOGGRPFLAGS_NONAME }
         };
-        psz++;
         unsigned    i;
         bool        fFound = false;
+        psz++;
         for (i = 0; i < ELEMENTS(aFlags) && !fFound; i++)
         {
@@ -1172 +1191 @@
     while (*pszVar)
     {
-        /* skip blanks. */
-        while (RT_C_IS_SPACE(*pszVar))
-            pszVar++;
-        if (!*pszVar)
-            return rc;
-
         /* parse instruction. */
         static struct
@@ -1215 +1228 @@
         bool fNo = false;
         char ch;
+        unsigned i;
+
+        /* skip blanks. */
+        while (RT_C_IS_SPACE(*pszVar))
+            pszVar++;
+        if (!*pszVar)
+            return rc;
+
         while ((ch = *pszVar) != '\0')
         {
@@ -1237 +1258 @@
 
         /* instruction. */
-        unsigned i;
         for (i = 0; i < ELEMENTS(aDest); i++)
         {
@@ -1371 +1391 @@
     if (pLogger)
     {
+        int32_t i;
+        unsigned j;
+
         AssertReturn(pLogger->u32Magic == RTLOGGER_MAGIC, VERR_INVALID_MAGIC);
 
@@ -1376 +1399 @@
          * Iterate the table to see if there is already an entry for this thread.
          */
-        int32_t i = ELEMENTS(g_aPerThreadLoggers);
+        i = ELEMENTS(g_aPerThreadLoggers);
         while (i-- > 0)
             if (g_aPerThreadLoggers[i].NativeThread == Self)
@@ -1395 +1418 @@
         }
 
-        unsigned j;
         for (j = 0; j < 10; j++)
         {
@@ -1624 +1646 @@
 static void rtlogLogger(PRTLOGGER pLogger, unsigned fFlags, unsigned iGroup, const char *pszFormat, va_list args)
 {
+    int rc;
+
     /*
      * Validate and correct iGroup.
@@ -1646 +1670 @@
      * Acquire logger instance sem.
      */
-    int rc = rtlogLock(pLogger);
+    rc = rtlogLock(pLogger);
     if (RT_FAILURE(rc))
         return;
@@ -1853 +1877 @@
         {
             size_t cb = sizeof(pLogger->achScratch) - pLogger->offScratch - 1;
+            char *psz;
+            const char *pszNewLine;
 
             /*
@@ -1885 +1911 @@
                  * psz is pointing to the current position.
                  */
-                char *psz = &pLogger->achScratch[pLogger->offScratch];
+                psz = &pLogger->achScratch[pLogger->offScratch];
                 if (pLogger->fFlags & RTLOGFLAGS_PREFIX_TS)
                 {
@@ -2157 +2183 @@
 
             /* have newline? */
-            const char *pszNewLine = (const char *)memchr(pachChars, '\n', cb);
+            pszNewLine = (const char *)memchr(pachChars, '\n', cb);
             if (pszNewLine)
             {

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

@@ -111 +111 @@
     for (pu8 = (const uint8_t *)pach; cb-- > 0; pu8++)
     {
+        register unsigned cMaxWait;
+        register uint8_t  u8;
+
         /* expand \n -> \r\n */
         if (*pu8 == '\n')
@@ -116 +119 @@
 
         /* Check if port is ready. */
-        register unsigned   cMaxWait = ~0;
-        register uint8_t    u8;
+        cMaxWait = ~0;
         do
         {

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

@@ -81 +81 @@
 RTDECL(size_t) RTStrPrintfExV(PFNSTRFORMAT pfnFormat, void *pvArg, char *pszBuffer, size_t cchBuffer, const char *pszFormat, va_list args)
 {
+    STRBUFARG Arg;
+
     if (!cchBuffer)
     {
@@ -87 +89 @@
     }
 
-    STRBUFARG Arg;
     Arg.psz = pszBuffer;
     Arg.cch = cchBuffer - 1;
@@ -102 +103 @@
 {
     va_list args;
+    size_t cbRet;
     va_start(args, pszFormat);
-    size_t cbRet = RTStrPrintfExV(pfnFormat, pvArg, pszBuffer, cchBuffer, pszFormat, args);
+    cbRet = RTStrPrintfExV(pfnFormat, pvArg, pszBuffer, cchBuffer, pszFormat, args);
     va_end(args);
     return cbRet;
@@ -111 +113 @@
 {
     va_list args;
+    size_t cbRet;
     va_start(args, pszFormat);
-    size_t cbRet = RTStrPrintfV(pszBuffer, cchBuffer, pszFormat, args);
+    cbRet = RTStrPrintfV(pszBuffer, cchBuffer, pszFormat, args);
     va_end(args);
     return cbRet;

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

@@ -106 +106 @@
 RTDECL(int) RTStrToUInt64Ex(const char *pszValue, char **ppszNext, unsigned uBase, uint64_t *pu64)
 {
-    const char *psz = pszValue;
+    const char   *psz = pszValue;
+    int           iShift;
+    int           rc;
+    uint64_t      u64;
+    unsigned char uch;
 
     /*
@@ -153 +157 @@
      * Note: We only support ascii digits at this time... :-)
      */
-    int             iShift = g_auchShift[uBase];
+    iShift = g_auchShift[uBase];
     pszValue = psz; /* (Prefix and sign doesn't count in the digit counting.) */
-    int             rc = VINF_SUCCESS;
-    uint64_t        u64 = 0;
-    unsigned char   uch;
+    rc = VINF_SUCCESS;
+    u64 = 0;
     while ((uch = (unsigned char)*psz) != 0)
     {
         unsigned char chDigit = g_auchDigits[uch];
+        uint64_t u64Prev;
+
         if (chDigit >= uBase)
             break;
 
-        uint64_t u64Prev = u64;
+        u64Prev = u64;
         u64 *= uBase;
         u64 += chDigit;
@@ -534 +539 @@
 RTDECL(int) RTStrToInt64Ex(const char *pszValue, char **ppszNext, unsigned uBase, int64_t *pi64)
 {
-    const char *psz = pszValue;
+    const char   *psz = pszValue;
+    int           iShift;
+    int           rc;
+    int64_t       i64;
+    unsigned char uch;
 
     /*
@@ -581 +590 @@
      * Note: We only support ascii digits at this time... :-)
      */
-    int             iShift = g_auchShift[uBase]; /** @todo test this, it's probably not 100% right yet. */
+    iShift = g_auchShift[uBase]; /** @todo test this, it's probably not 100% right yet. */
     pszValue = psz; /* (Prefix and sign doesn't count in the digit counting.) */
-    int             rc = VINF_SUCCESS;
-    int64_t         i64 = 0;
-    unsigned char   uch;
+    rc = VINF_SUCCESS;
+    i64 = 0;
     while ((uch = (unsigned char)*psz) != 0)
     {
         unsigned char chDigit = g_auchDigits[uch];
+        int64_t i64Prev;
+
         if (chDigit >= uBase)
             break;
 
-        int64_t i64Prev = i64;
+        i64Prev = i64;
         i64 *= uBase;
         i64 += chDigit;