Changeset 40574 in vbox for trunk

Timestamp:

Mar 22, 2012 2:10:56 PM (13 years ago)

Author:

vboxsync

Message:

GuestCtrl: Don't set API error when no output cannot be retrieved anymore.

File:

• trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp

@@ -1368 +1368 @@
                                               0 /* Infinite timeout */,
                                               _64K, ComSafeArrayAsOutParam(aData), &rc);
-        if (SUCCEEDED(hr))
+        if (RT_SUCCESS(rc))
         {
             if (aData.size())
@@ -1859 +1859 @@
     {
         rc = E_OUTOFMEMORY;
+        if (pRC)
+            *pRC = VERR_NO_MEMORY;
     }
     return rc;
@@ -2108 +2110 @@
              * don't remove it but report back an appropriate error. */
             vrc = VERR_BROKEN_PIPE;
-            rc = setError(VBOX_E_IPRT_ERROR,
-                          Guest::tr("Guest process (PID %u) does not run anymore"), aPID);
+            /* Not getting any output is fine, so don't report an API error (rc)
+             * and only signal something through internal error code (vrc). */
         }
 
@@ -2271 +2273 @@
     {
         rc = E_OUTOFMEMORY;
+        if (pRC)
+            *pRC = VERR_NO_MEMORY;
     }
     return rc;