Changeset 28707 in vbox

Timestamp:

Apr 25, 2010 5:18:04 PM (15 years ago)

Author:

vboxsync

Message:

GuestImpl.cpp: Fixed warnings (scope alocks). Don't assert on RTMemAlloc restuls, unless it's a AssertReturn.

File:

• trunk/src/VBox/Main/GuestImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -529 +529 @@
             }
             else
-                LogFlowFunc(("Callback (context ID=%u, status=%u) progress already marked as completed\n", 
+                LogFlowFunc(("Callback (context ID=%u, status=%u) progress already marked as completed\n",
                              pData->hdr.u32ContextID, pData->u32Status));
         }
@@ -836 +836 @@
                             break;
 
-                        /* In any other case the process either already 
+                        /* In any other case the process either already
                          * terminated or something else went wrong, so no PID ... */
                         case PROC_STS_TEN: /* Terminated normally. */
@@ -947 +947 @@
     /* Search for existing PID. */
     PHOSTEXECOUTCALLBACKDATA pData = (HOSTEXECOUTCALLBACKDATA*)RTMemAlloc(sizeof(HOSTEXECOUTCALLBACKDATA));
-    AssertPtr(pData);
     uint32_t uContextID = addCtrlCallbackContext(pData, sizeof(HOSTEXECOUTCALLBACKDATA), NULL /* pProgress */);
     Assert(uContextID > 0);
@@ -962 +961 @@
     int vrc = VINF_SUCCESS;
 
-    /* Make sure mParent is valid, so set the read lock while using. */
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    /* Forward the information to the VMM device. */
-    AssertPtr(mParent);
-    VMMDev *vmmDev = mParent->getVMMDev();
-    if (vmmDev)
-    {
-        LogFlowFunc(("hgcmHostCall numParms=%d\n", i));
-        vrc = vmmDev->hgcmHostCall("VBoxGuestControlSvc", HOST_EXEC_GET_OUTPUT,
-                                   i, paParms);
-    }
-
-    alock.release();
+    {
+        /* Make sure mParent is valid, so set the read lock while using. */
+        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+        /* Forward the information to the VMM device. */
+        AssertPtr(mParent);
+        VMMDev *vmmDev = mParent->getVMMDev();
+        if (vmmDev)
+        {
+            LogFlowFunc(("hgcmHostCall numParms=%d\n", i));
+            vrc = vmmDev->hgcmHostCall("VBoxGuestControlSvc", HOST_EXEC_GET_OUTPUT,
+                                       i, paParms);
+        }
+    }
 
     if (RT_SUCCESS(vrc))
@@ -1008 +1007 @@
 
             /* Did we get some output? */
-            PHOSTEXECOUTCALLBACKDATA pData = (HOSTEXECOUTCALLBACKDATA*)it->pvData;
+            pData = (HOSTEXECOUTCALLBACKDATA*)it->pvData;
             Assert(it->cbData == sizeof(HOSTEXECOUTCALLBACKDATA));
             AssertPtr(pData);
-    
+
             if (   it->bCalled
                 && pData->cbData)
@@ -1018 +1017 @@
                 if (pData->cbData > cbData)
                     outputData.resize(pData->cbData);
-    
+
                 /* Fill output in supplied out buffer. */
                 memcpy(outputData.raw(), pData->pvData, pData->cbData);
@@ -1025 +1024 @@
             else
                 vrc = VERR_NO_DATA; /* This is not an error we want to report to COM. */
-
-            alock.release();
         }