Changeset 44045 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Dec 6, 2012 8:19:53 AM (12 years ago)

Author:

vboxsync

Message:

VBoxServiceControlExecGetOutput: Shut up a gcc maybe warning and fixed something it forgot to warn about regarding pRequest.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp

@@ -440 +440 @@
  * @param   uPID                    PID of process to retrieve the output from.
  * @param   uHandleId               Stream ID (stdout = 0, stderr = 2) to get the output from.
- * @param   uTimeout                Timeout (in ms) to wait for output becoming available.
+ * @param   cMsTimeout              Timeout (in ms) to wait for output becoming
+ *                                  available.
  * @param   pvBuf                   Pointer to a pre-allocated buffer to store the output.
  * @param   cbBuf                   Size (in bytes) of the pre-allocated buffer.
@@ -446 +447 @@
  */
 int VBoxServiceControlExecGetOutput(uint32_t uPID, uint32_t uCID,
-                                    uint32_t uHandleId, uint32_t uTimeout,
+                                    uint32_t uHandleId, uint32_t cMsTimeout,
                                     void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
     AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
     AssertReturn(cbBuf, VERR_INVALID_PARAMETER);
-    /* pcbRead is optional. */
-
-    int rc = VINF_SUCCESS;
-    VBOXSERVICECTRLREQUESTTYPE reqType;
+    AssertPtrNullReturn(pcbRead, VERR_INVALID_POINTER);
+
+    int                         rc      = VINF_SUCCESS;
+    VBOXSERVICECTRLREQUESTTYPE  reqType = VBOXSERVICECTRLREQUEST_UNKNOWN; /* (gcc maybe, well, wrong.) */
     switch (uHandleId)
     {
@@ -471 +472 @@
     }
 
-    PVBOXSERVICECTRLREQUEST pRequest;
-    if (RT_SUCCESS(rc))
-    {
-        rc = VBoxServiceControlThreadRequestAllocEx(&pRequest, reqType,
-                                                    pvBuf, cbBuf, uCID);
-        if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
+    {
+        PVBOXSERVICECTRLREQUEST pRequest;
+        rc = VBoxServiceControlThreadRequestAllocEx(&pRequest, reqType, pvBuf, cbBuf, uCID);
+        if (RT_SUCCESS(rc))
+        {
             rc = VBoxServiceControlThreadPerform(uPID, pRequest);
-
-        if (RT_SUCCESS(rc))
-        {
-            if (pcbRead)
+            if (RT_SUCCESS(rc) && pcbRead)
                 *pcbRead = pRequest->cbData;
-        }
-
-        VBoxServiceControlThreadRequestFree(pRequest);
+            VBoxServiceControlThreadRequestFree(pRequest);
+        }
     }