Changeset 52933 in vbox for trunk

Timestamp:

Oct 2, 2014 1:44:24 PM (10 years ago)

Author:

vboxsync

Message:

MachineImpl: return code mismatch

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -8425 +8425 @@
                         DECODE_STR_MAX);
     com::SafeArray<BYTE> iconByte(cbOut);
-    HRESULT rc = RTBase64Decode(pszStr, iconByte.raw(), cbOut, NULL, NULL);
-    if (FAILED(rc))
+    int vrc = RTBase64Decode(pszStr, iconByte.raw(), cbOut, NULL, NULL);
+    if (RT_FAILURE(vrc))
         return setError(E_FAIL,
-                        tr("Failure to Decode Icon Data. '%s' (%d)"),
+                        tr("Failure to Decode Icon Data. '%s' (%Rrc)"),
                         pszStr,
-                        rc);
+                        vrc);
     mUserData->mIcon.resize(iconByte.size());
     memcpy(&mUserData->mIcon[0], iconByte.raw(), mUserData->mIcon.size());
@@ -8436 +8436 @@
     // look up the object by Id to check it is valid
     ComPtr<IGuestOSType> guestOSType;
-    rc = mParent->GetGuestOSType(Bstr(mUserData->s.strOsType).raw(),
+    HRESULT rc = mParent->GetGuestOSType(Bstr(mUserData->s.strOsType).raw(),
                                          guestOSType.asOutParam());
     if (FAILED(rc)) return rc;
@@ -8446 +8446 @@
     {
         Utf8Str stateFilePathFull(config.strStateFile);
-        int vrc = i_calculateFullPath(stateFilePathFull, stateFilePathFull);
+        vrc = i_calculateFullPath(stateFilePathFull, stateFilePathFull);
         if (RT_FAILURE(vrc))
             return setError(E_FAIL,