Changeset 5888 in vbox

Timestamp:

Nov 30, 2007 12:36:21 PM (17 years ago)

Author:

vboxsync

Message:

r=bird: 'b' == byte(s), no else after return, use AssertPtrReturn, memset instead of incomplete init, doxygen autobrief, space consistency.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp

@@ -16 +16 @@
 *******************************************************************************/
 #include <iprt/assert.h>
+#include <iprt/string.h>
 
 #include <VBox/VBoxGuest.h>
@@ -21 +22 @@
 #include <VBox/log.h>
 
-#include <string.h>
 
 /* Move this to a header { */
@@ -33 +33 @@
  *
  * @returns IPRT status value
- * @param   bState whether or not we support seamless mode
+ * @param   fState whether or not we support seamless mode
  *
  * @todo    Currently this will trample over any other capabilities the guest may have.
  *          This will have to be fixed when more capabilities are added at the latest.
  */
-VBGLR3DECL(int) VbglR3SeamlessSetCap(bool bState)
+VBGLR3DECL(int) VbglR3SeamlessSetCap(bool fState)
 {
-    VMMDevReqGuestCapabilities vmmreqGuestCaps = { {0} };
+    VMMDevReqGuestCapabilities vmmreqGuestCaps;
     int rc = VINF_SUCCESS;
 
+    memset(&vmmreqGuestCaps, 0, sizeof(vmmreqGuestCaps));
     vmmdevInitRequest(&vmmreqGuestCaps.header, VMMDevReq_ReportGuestCapabilities);
-    vmmreqGuestCaps.caps = bState ? VMMDEV_GUEST_SUPPORTS_SEAMLESS : 0;
+    vmmreqGuestCaps.caps = fState ? VMMDEV_GUEST_SUPPORTS_SEAMLESS : 0;
     rc = VbglR3GRPerform(&vmmreqGuestCaps.header);
 #ifdef DEBUG
     if (RT_SUCCESS(rc))
-    {
         LogRel(("Successfully enabled seamless mode on the host.\n"));
-    }
     else
-    {
-        LogRel(("Failed to enabled seamless mode on the host, rc = %Vrc.\n", rc));
-    }
+        LogRel(("Failed to enabled seamless mode on the host, rc = %Rrc.\n", rc));
 #endif
     return rc;
@@ -71 +68 @@
     int rc;
 
-    AssertReturn(pMode != 0, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pMode, VERR_INVALID_PARAMETER);
     waitEvent.u32TimeoutIn = 0;
     waitEvent.u32EventMaskIn = VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST;
@@ -114 +111 @@
     int rc;
 
-    rc = VbglR3GRAlloc ((VMMDevRequestHeader **)&req,
-                      sizeof (VMMDevVideoSetVisibleRegion) + (cRects-1)*sizeof(RTRECT),
-                      VMMDevReq_VideoSetVisibleRegion);
+    rc = VbglR3GRAlloc((VMMDevRequestHeader **)&req,
+                       sizeof(VMMDevVideoSetVisibleRegion) + (cRects - 1) * sizeof(RTRECT),
+                       VMMDevReq_VideoSetVisibleRegion);
     if (RT_SUCCESS(rc))
     {
         req->cRect = cRects;
-        memcpy(&req->Rect, pRects, cRects*sizeof(RTRECT));
-        rc = VbglR3GRPerform (&req->header);
+        memcpy(&req->Rect, pRects, cRects * sizeof(RTRECT));
+        rc = VbglR3GRPerform(&req->header);
         VbglR3GRFree(&req->header);
         if (RT_SUCCESS(rc))
         {
             if (RT_SUCCESS(req->header.rc))
-            {
                 return VINF_SUCCESS;
-            }
-            else
-                rc = req->header.rc;
+            rc = req->header.rc;
         }
     }
     return rc;
 }
+