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

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Runtime/generic

Files:

• env-generic.cpp (modified) (2 diffs)
• uuid-generic.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/generic/env-generic.cpp

@@ -245 +245 @@
             for (size_t iVar = 0; iVar < cVars; iVar++)
             {
-                int rc = RTStrCurrentCPToUtf8(&pIntEnv->papszEnv[iVar], papszEnv[iVar]);
-                if (RT_FAILURE(rc))
+                int rc2 = RTStrCurrentCPToUtf8(&pIntEnv->papszEnv[iVar], papszEnv[iVar]);
+                if (RT_FAILURE(rc2))
                 {
                     pIntEnv->cVars = iVar;
                     RTEnvDestroy(pIntEnv);
-                    return rc;
+                    return rc2;
                 }
             }
@@ -265 +265 @@
                     pIntEnv->cVars = iVar;
                     RTEnvDestroy(pIntEnv);
-                    return rc;
+                    return VERR_NO_STR_MEMORY;
                 }
                 pIntEnv->papszEnv[iVar] = pszVar;

trunk/src/VBox/Runtime/generic/uuid-generic.cpp

@@ -324 +324 @@
 RTDECL(int)  RTUuidToUtf16(PCRTUUID pUuid, PRTUTF16 pwszString, size_t cwcString)
 {
-    static const char g_achDigits[17] = "0123456789abcdef";
     uint32_t u32TimeLow;
     unsigned u;