Changeset 45686 in vbox for trunk/src/VBox

Timestamp:

Apr 23, 2013 6:15:40 PM (12 years ago)

Author:

vboxsync

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

85223

Message:

Console::setGuestProperty: some cleanup.

File:

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

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

@@ -5499 +5499 @@
     ReturnComNotImplemented();
 #else /* VBOX_WITH_GUEST_PROPS */
-    if (!VALID_PTR(aName))
+    if (!RT_VALID_PTR(aName))
         return setError(E_INVALIDARG, tr("Name cannot be NULL or an invalid pointer"));
-    if ((aValue != NULL) && !VALID_PTR(aValue))
+    if (aValue != NULL && !RT_VALID_PTR(aValue))
         return setError(E_INVALIDARG, tr("Invalid value pointer"));
-    if ((aFlags != NULL) && !VALID_PTR(aFlags))
+    if (aFlags != NULL && !RT_VALID_PTR(aFlags))
         return setError(E_INVALIDARG, tr("Invalid flags pointer"));
 
@@ -5517 +5517 @@
      * ptrVM, so there is no need to hold a lock of this */
 
-    HRESULT rc = E_UNEXPECTED;
     using namespace guestProp;
 
     VBOXHGCMSVCPARM parm[3];
+
     Utf8Str Utf8Name = aName;
-    int vrc = VINF_SUCCESS;
-
     parm[0].type = VBOX_HGCM_SVC_PARM_PTR;
     parm[0].u.pointer.addr = (void*)Utf8Name.c_str();
     /* The + 1 is the null terminator */
     parm[0].u.pointer.size = (uint32_t)Utf8Name.length() + 1;
-    Utf8Str Utf8Value = aValue;
+
     if (aValue != NULL)
     {
+        Utf8Str Utf8Value = aValue;
         parm[1].type = VBOX_HGCM_SVC_PARM_PTR;
-        parm[1].u.pointer.addr = (void*)Utf8Value.c_str();
+        parm[1].u.pointer.addr = (void *)Utf8Value.c_str();
         /* The + 1 is the null terminator */
         parm[1].u.pointer.size = (uint32_t)Utf8Value.length() + 1;
     }
-    Utf8Str Utf8Flags = aFlags;
+
     if (aFlags != NULL)
     {
+        Utf8Str Utf8Flags = aFlags;
         parm[2].type = VBOX_HGCM_SVC_PARM_PTR;
         parm[2].u.pointer.addr = (void*)Utf8Flags.c_str();
@@ -5544 +5544 @@
         parm[2].u.pointer.size = (uint32_t)Utf8Flags.length() + 1;
     }
-    if ((aValue != NULL) && (aFlags != NULL))
+
+    int vrc;
+    if (aValue != NULL && aFlags != NULL)
         vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", SET_PROP_HOST,
                                       3, &parm[0]);
@@ -5553 +5555 @@
         vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", DEL_PROP_HOST,
                                     1, &parm[0]);
+    HRESULT hrc;
     if (RT_SUCCESS(vrc))
-        rc = S_OK;
+        hrc = S_OK;
     else
-        rc = setError(E_UNEXPECTED,
-            tr("The service call failed with the error %Rrc"),
-            vrc);
-    return rc;
+        hrc = setError(E_UNEXPECTED, tr("The service call failed with the error %Rrc"), vrc);
+    return hrc;
 #endif /* VBOX_WITH_GUEST_PROPS */
 }