Changeset 22603 in vbox

Timestamp:

Aug 31, 2009 1:00:58 PM (16 years ago)

Author:

vboxsync

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

51654

Message:

Main/GuestProperties: tentatively fix r51587 and r51594 to use C constructs, not C++ ones, part 2

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2839 +2839 @@
             AssertFailedReturn(VERR_INVALID_PARAMETER);
 
-        char **pacszNames, **pacszValues, **pacszFlags;
+        char **papszNames, **papszValues, **papszFlags;
         char szEmpty[] = "";
         ULONG64 *pau64Timestamps;
-        pacszNames = (char **)RTMemTmpAllocZ(sizeof(void *) * cAlloc);
-        pacszValues = (char **)RTMemTmpAllocZ(sizeof(void *) * cAlloc);
+        papszNames = (char **)RTMemTmpAllocZ(sizeof(void *) * cAlloc);
+        papszValues = (char **)RTMemTmpAllocZ(sizeof(void *) * cAlloc);
         pau64Timestamps = (ULONG64 *)RTMemTmpAllocZ(sizeof(ULONG64) * cAlloc);
-        pacszFlags = (char **)RTMemTmpAllocZ(sizeof(void *) * cAlloc);
-        if (!(pacszNames && pacszValues && pau64Timestamps && pacszFlags))
+        papszFlags = (char **)RTMemTmpAllocZ(sizeof(void *) * cAlloc);
+        if (papszNames && papszValues && pau64Timestamps && papszFlags)
+        {
+            for (unsigned i = 0; RT_SUCCESS(rc) && i < cProps; ++i)
+            {
+                AssertPtrReturn(namesOut[i], VERR_INVALID_PARAMETER);
+                rc = RTUtf16ToUtf8(namesOut[i], &papszNames[i]);
+                if (RT_FAILURE(rc))
+                    break;
+                if (valuesOut[i])
+                    rc = RTUtf16ToUtf8(valuesOut[i], &papszValues[i]);
+                else
+                    papszValues[i] = szEmpty;
+                if (RT_FAILURE(rc))
+                    break;
+                pau64Timestamps[i] = timestampsOut[i];
+                if (flagsOut[i])
+                    rc = RTUtf16ToUtf8(flagsOut[i], &papszFlags[i]);
+                else
+                    papszFlags[i] = szEmpty;
+            }
+            if (RT_SUCCESS(rc))
+                configSetProperties(pConsole->mVMMDev,
+                                    (void *)papszNames,
+                                    (void *)papszValues,
+                                    (void *)pau64Timestamps,
+                                    (void *)papszFlags);
+            for (unsigned i = 0; i < cProps; ++i)
+            {
+                RTStrFree(papszNames[i]);
+                if (valuesOut[i])
+                    RTStrFree(papszValues[i]);
+                if (flagsOut[i])
+                    RTStrFree(papszFlags[i]);
+            }
+        }
+        else
             rc = VERR_NO_MEMORY;
-        for (unsigned i = 0; RT_SUCCESS(rc) && i < cProps; ++i)
-        {
-            AssertPtrReturn(namesOut[i], VERR_INVALID_PARAMETER);
-            rc = RTUtf16ToUtf8(namesOut[i], &pacszNames[i]);
-            if (RT_FAILURE(rc))
-                break;
-            if (valuesOut[i])
-                rc = RTUtf16ToUtf8(valuesOut[i], &pacszValues[i]);
-            else
-                pacszValues[i] = szEmpty;
-            if (RT_FAILURE(rc))
-                break;
-            pau64Timestamps[i] = timestampsOut[i];
-            if (flagsOut[i])
-                rc = RTUtf16ToUtf8(flagsOut[i], &pacszFlags[i]);
-            else
-                pacszFlags[i] = szEmpty;
-        }
-        if (RT_SUCCESS(rc))
-            configSetProperties(pConsole->mVMMDev, (void *)pacszNames,
-                                (void *)pacszValues, (void *)pau64Timestamps,
-                                (void *)pacszFlags);
-        if (pacszNames && pacszValues && pau64Timestamps && pacszFlags)
-            for (unsigned i = 0; i < cProps; ++i)
-            {
-                RTStrFree(pacszNames[i]);
-                if (valuesOut[i])
-                    RTStrFree(pacszValues[i]);
-                if (flagsOut[i])
-                    RTStrFree(pacszFlags[i]);
-            }
-        RTMemTmpFree(pacszNames);
-        RTMemTmpFree(pacszValues);
+        RTMemTmpFree(papszNames);
+        RTMemTmpFree(papszValues);
         RTMemTmpFree(pau64Timestamps);
-        RTMemTmpFree(pacszFlags);
+        RTMemTmpFree(papszFlags);
+        AssertRCReturn(rc, rc);
 
         /* Set the VBox version string as a guest property */