Changeset 10829 in vbox for trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

Timestamp:

Jul 23, 2008 1:06:20 PM (17 years ago)

Author:

vboxsync

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

33614

Message:

Additions/common: small adjustment in guest property reading code

File:

• trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

@@ -884 +884 @@
     int rc = VINF_SUCCESS;
 
-    /* We leave a bit of space here in case the maximum values are raised. */
-    uint32_t cbBuf = MAX_VALUE_LEN + MAX_FLAGS_LEN + 1024;
-    void *pvBuf = RTMemAlloc(cbBuf);
-    if (NULL == pvBuf)
-    {
-        rc = VERR_NO_MEMORY;
-        VBoxControlError("Out of memory\n");
-    }
-    if (RT_SUCCESS(rc))
-    {
-        rc = VbglR3GuestPropConnect(&u32ClientId);
-        if (!RT_SUCCESS(rc))
-            VBoxControlError("Failed to connect to the guest property service, error %Rrc\n", rc);
-    }
+    rc = VbglR3GuestPropConnect(&u32ClientId);
+    if (!RT_SUCCESS(rc))
+        VBoxControlError("Failed to connect to the guest property service, error %Rrc\n", rc);
 
 /*
@@ -913 +902 @@
          * enough with buffer space. */
         bool finish = false;
-        for (int i = 0; (i < 10) && !finish; ++i)
-        {
-            rc = VbglR3GuestPropRead(u32ClientId, pszName, pvBuf, cbBuf,
-                                     &pszValue, &u64Timestamp, &pszFlags,
-                                     &cbBuf);
+        /* We leave a bit of space here in case the maximum values are raised. */
+        void *pvBuf = NULL;
+        uint32_t cbBuf = MAX_VALUE_LEN + MAX_FLAGS_LEN + 1024;
+        for (unsigned i = 0; (i < 10) && !finish; ++i)
+        {
+            pvBuf = RTMemRealloc(pvBuf, cbBuf);
+            if (NULL == pvBuf)
+            {
+                rc = VERR_NO_MEMORY;
+                VBoxControlError("Out of memory\n");
+            }
+            else
+                rc = VbglR3GuestPropRead(u32ClientId, pszName, pvBuf, cbBuf,
+                                         &pszValue, &u64Timestamp, &pszFlags,
+                                         &cbBuf);
             if (VERR_BUFFER_OVERFLOW == rc)
-            {
-                pvBuf = RTMemRealloc(pvBuf, cbBuf);
-                if (NULL == pvBuf)
-                    rc = VERR_NO_MEMORY;
-            }
-            if (rc != VERR_BUFFER_OVERFLOW)
+                /* Leave a bit of extra space to be safe */
+                cbBuf += 1024;
+            else
                 finish = true;
         }