Changeset 31749 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 18, 2010 11:14:51 AM (15 years ago)

Author:

vboxsync

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

64930

Message:

HGCMInternal.cpp: Avoid unused variable on non-linux platforms.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp (modified) (2 diffs)

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

@@ -305 +305 @@
                               iParm, pSrcParm->type, cb, pSrcParm->u.Pointer.u.linearAddr, hObj));
                     }
+                    else if (cb > VBGLR0_MAX_HGCM_USER_PARM)
+                    {
+                        Log(("GstHGCMCall: id=%#x fn=%u parm=%u pv=%p cb=%#x > %#x -> out of range\n",
+                             pCallInfo->u32ClientID, pCallInfo->u32Function, iParm, pSrcParm->u.Pointer.u.linearAddr,
+                             cb, VBGLR0_MAX_HGCM_USER_PARM));
+                        return VERR_OUT_OF_RANGE;
+                    }
                     else
                     {
-                        bool fCopyIn;
-
-                        if (cb > VBGLR0_MAX_HGCM_USER_PARM)
-                        {
-                            Log(("GstHGCMCall: id=%#x fn=%u parm=%u pv=%p cb=%#x > %#x -> out of range\n",
-                                 pCallInfo->u32ClientID, pCallInfo->u32Function, iParm, pSrcParm->u.Pointer.u.linearAddr,
-                                 cb, VBGLR0_MAX_HGCM_USER_PARM));
-                            return VERR_OUT_OF_RANGE;
-                        }
-
 #ifndef USE_BOUNCE_BUFFERS
                         rc = RTR0MemObjLockUser(&hObj, (RTR3PTR)pSrcParm->u.Pointer.u.linearAddr, cb, fAccess, NIL_RTR0PROCESS);
@@ -339 +336 @@
                          *        is probably going to be more massive than the current code, so
                          *        it can wait till later.   */
-                        fCopyIn =    pSrcParm->type != VMMDevHGCMParmType_LinAddr_Out
-                                  && pSrcParm->type != VMMDevHGCMParmType_LinAddr_Locked_Out;
+                        bool fCopyIn = pSrcParm->type != VMMDevHGCMParmType_LinAddr_Out
+                                    && pSrcParm->type != VMMDevHGCMParmType_LinAddr_Locked_Out;
                         if (cb <= PAGE_SIZE / 2 - 16)
                         {