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

Timestamp:

Nov 26, 2009 2:22:44 PM (15 years ago)

Author:

vboxsync

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

55308

Message:

IPRT: Fixed -Wshadow warnings, found two bugs in error paths.

Location:

trunk/src/VBox/Runtime/common

Files:

• ldr/ldrELFRelocatable.cpp.h (modified) (2 diffs)
• misc/handletablectx.cpp (modified) (1 diff)
• misc/handletablesimple.cpp (modified) (1 diff)
• misc/thread.cpp (modified) (1 diff)
• misc/zip.cpp (modified) (2 diffs)
• string/strformatrt.cpp (modified) (10 diffs)
• string/utf-8.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h

@@ -489 +489 @@
                  */
                 AssertMsgReturn(Value == (RTUINTPTR)Value, (FMT_ELF_ADDR "\n", Value), VERR_SYMBOL_VALUE_TOO_BIG);
-                int rc = pfnCallback(pMod, pszName, ~0, (RTUINTPTR)Value, pvUser);
+                rc = pfnCallback(pMod, pszName, ~0, (RTUINTPTR)Value, pvUser);
                 if (rc)
                     return rc;
@@ -873 +873 @@
         for (unsigned i = 0; i < cbName; i++, off++)
         {
-            int rc = pModElf->pReader->pfnRead(pModElf->pReader, pszName + i, 1, off);
+            rc = pModElf->pReader->pfnRead(pModElf->pReader, pszName + i, 1, off);
             if (RT_FAILURE(rc))
             {

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

@@ -176 +176 @@
                 &&  pThis->cCur < pThis->cMax)
             {
-                uint32_t i;
-
                 pThis->papvLevel1[iLevel1New] = paTable;
 

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

@@ -170 +170 @@
                 /* link all entries into a free list. */
                 Assert(!(pThis->cCur % RTHT_LEVEL2_ENTRIES));
-                for (uint32_t i = 0; i < RTHT_LEVEL2_ENTRIES - 1; i++)
+                for (i = 0; i < RTHT_LEVEL2_ENTRIES - 1; i++)
                     RTHT_SET_FREE_IDX((PRTHTENTRYFREE)&paTable[i], i + 1 + pThis->cCur);
                 RTHT_SET_FREE_IDX((PRTHTENTRYFREE)&paTable[RTHT_LEVEL2_ENTRIES - 1], NIL_RTHT_INDEX);

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

@@ -136 +136 @@
          * But first, we'll create the semaphore.
          */
-        int rc = RTSemRWCreate(&g_ThreadRWSem);
+        rc = RTSemRWCreate(&g_ThreadRWSem);
         if (RT_SUCCESS(rc))
         {

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

@@ -565 +565 @@
     pZip->u.Zlib.next_out = (Bytef *)pvBuf;
     pZip->u.Zlib.avail_out = (uInt)cbBuf;                   Assert(pZip->u.Zlib.avail_out == cbBuf);
-    int rc = Z_OK;
-    /* Be greedy reading input, even if no output buffer is left. It's possible
+
+    /*
+     * Be greedy reading input, even if no output buffer is left. It's possible
      * that it's just the end of stream marker which needs to be read. Happens
-     * for incompressible blocks just larger than the input buffer size.*/
+     * for incompressible blocks just larger than the input buffer size.
+     */
     while (pZip->u.Zlib.avail_out > 0 || pZip->u.Zlib.avail_in <= 0)
     {
@@ -587 +589 @@
          * Pass it on to zlib.
          */
-        rc = inflate(&pZip->u.Zlib, Z_NO_FLUSH);
+        int rc = inflate(&pZip->u.Zlib, Z_NO_FLUSH);
         if (rc == Z_STREAM_END)
         {

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

@@ -572 +572 @@
             case 'f':
             {
-                char ch = *(*ppszFormat)++;
-                switch (ch)
+                switch (*(*ppszFormat)++)
                 {
                     /*
@@ -607 +606 @@
 
                     default:
-                        AssertMsgFailed(("Invalid status code format type '%.10s'!\n", ch, pszFormatOrg));
+                        AssertMsgFailed(("Invalid status code format type '%.10s'!\n", pszFormatOrg));
                         break;
                 }
@@ -619 +618 @@
             case 'h':
             {
-                char ch = *(*ppszFormat)++;
-                switch (ch)
+                switch (*(*ppszFormat)++)
                 {
                     /*
@@ -632 +630 @@
                         if (pu8)
                         {
-                            ch = *(*ppszFormat)++;
-                            switch (ch)
+                            switch (*(*ppszFormat)++)
                             {
                                 /*
@@ -687 +684 @@
 
                                 default:
-                                    AssertMsgFailed(("Invalid status code format type '%.10s'!\n", ch, pszFormatOrg));
+                                    AssertMsgFailed(("Invalid status code format type '%.10s'!\n", pszFormatOrg));
                                     break;
                             }
@@ -704 +701 @@
                     case 'r':
                     {
-
-                        char ch = *(*ppszFormat)++;
                         uint32_t hrc = va_arg(*pArgs, uint32_t);
                         PCRTCOMERRMSG pMsg = RTErrCOMGet(hrc);
-                        switch (ch)
+                        switch (*(*ppszFormat)++)
                         {
                             case 'c':
@@ -725 +720 @@
 
                     default:
-                        AssertMsgFailed(("Invalid status code format type '%.10s'!\n", ch, pszFormatOrg));
+                        AssertMsgFailed(("Invalid status code format type '%.10s'!\n", pszFormatOrg));
                         return 0;
 
@@ -738 +733 @@
             {
                 int rc = va_arg(*pArgs, int);
-                char ch = *(*ppszFormat)++;
 #ifdef IN_RING3                         /* we don't want this anywhere else yet. */
                 PCRTSTATUSMSG pMsg = RTErrGet(rc);
-                switch (ch)
+                switch (*(*ppszFormat)++)
                 {
                     case 'c':
@@ -756 +750 @@
                 }
 #else /* !IN_RING3 */
-                switch (ch)
+                switch (*(*ppszFormat)++)
                 {
                     case 'c':
@@ -778 +772 @@
             {
                 long rc = va_arg(*pArgs, long);
-                char ch = *(*ppszFormat)++;
 # if defined(RT_OS_WINDOWS)
                 PCRTWINERRMSG pMsg = RTErrWinGet(rc);
 # endif
-                switch (ch)
+                switch (*(*ppszFormat)++)
                 {
 # if defined(RT_OS_WINDOWS)

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

@@ -1160 +1160 @@
                &&   !(uMask & 1))
         {
-            unsigned uch = *--puch;
+            uch = *--puch;
             if ((uch & 0xc0) != 0x80)
             {