Changeset 31720 in vbox

Timestamp:

Aug 17, 2010 11:37:35 AM (15 years ago)

Author:

vboxsync

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

64879

Message:

Additions: fixed the gcc C90 warnings regardings mixed declarations and code

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuest/VBoxGuest.cpp (modified) (27 diffs)
• VBoxGuestLib/GenericRequest.cpp (modified) (2 diffs)
• VBoxGuestLib/HGCMInternal.cpp (modified) (3 diffs)
• VBoxGuestLib/SysHlp.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -1181 +1181 @@
                                           VBoxGuestWaitEventInfo *pInfo,  size_t *pcbDataReturned, bool fInterruptible)
 {
+    const uint32_t fReqEvents = pInfo->u32EventMaskIn;
+    uint32_t fResEvents;
+    int iEvent;
+    int rc;
+    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
+    PVBOXGUESTWAIT pWait;
+
     pInfo->u32EventFlagsOut = 0;
     pInfo->u32Result = VBOXGUEST_WAITEVENT_ERROR;
@@ -1189 +1196 @@
      * Copy and verify the input mask.
      */
-    const uint32_t fReqEvents = pInfo->u32EventMaskIn;
-    int iEvent = ASMBitFirstSetU32(fReqEvents) - 1;
+    iEvent = ASMBitFirstSetU32(fReqEvents) - 1;
     if (RT_UNLIKELY(iEvent < 0))
     {
@@ -1200 +1206 @@
      * Check the condition up front, before doing the wait-for-event allocations.
      */
-    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
     RTSpinlockAcquireNoInts(pDevExt->EventSpinlock, &Tmp);
-    int rc = WaitEventCheckCondition(pDevExt, pInfo, iEvent, fReqEvents, &Tmp);
+    rc = WaitEventCheckCondition(pDevExt, pInfo, iEvent, fReqEvents, &Tmp);
     if (rc == VINF_SUCCESS)
         return rc;
@@ -1214 +1219 @@
     }
 
-    PVBOXGUESTWAIT pWait = VBoxGuestWaitAlloc(pDevExt, pSession);
+    pWait = VBoxGuestWaitAlloc(pDevExt, pSession);
     if (!pWait)
         return VERR_NO_MEMORY;
@@ -1254 +1259 @@
     RTSpinlockAcquireNoInts(pDevExt->EventSpinlock, &Tmp);
     VBoxGuestWaitUnlink(&pDevExt->WaitList, pWait);
-    const uint32_t fResEvents = pWait->fResEvents;
+    fResEvents = pWait->fResEvents;
     VBoxGuestWaitFreeLocked(pDevExt, pWait);
     RTSpinlockReleaseNoInts(pDevExt->EventSpinlock, &Tmp);
@@ -1359 +1364 @@
                                            VMMDevRequestHeader *pReqHdr, size_t cbData, size_t *pcbDataReturned)
 {
-    Log(("VBoxGuestCommonIOCtl: VMMREQUEST type %d\n", pReqHdr->requestType));
-
     /*
      * Validate the header and request size.
@@ -1367 +1370 @@
     const uint32_t          cbReq     = pReqHdr->size;
     const uint32_t          cbMinSize = vmmdevGetRequestSize(enmType);
+    int rc;
+    VMMDevRequestHeader *pReqCopy;
+
+    Log(("VBoxGuestCommonIOCtl: VMMREQUEST type %d\n", pReqHdr->requestType));
+
     if (cbReq < cbMinSize)
     {
@@ -1379 +1387 @@
         return VERR_INVALID_PARAMETER;
     }
-    int rc = VbglGRVerify(pReqHdr, cbData);
+    rc = VbglGRVerify(pReqHdr, cbData);
     if (RT_FAILURE(rc))
     {
@@ -1394 +1402 @@
      * it does makes things a bit simpler wrt to phys address.)
      */
-    VMMDevRequestHeader *pReqCopy;
     rc = VbglGRAlloc(&pReqCopy, cbReq, enmType);
     if (RT_FAILURE(rc))
@@ -1461 +1468 @@
                                                  bool fInterruptible, uint32_t cMillies)
 {
+    int rc;
 
     /*
@@ -1506 +1514 @@
     RTSpinlockReleaseNoInts(pDevExt->EventSpinlock, &Tmp);
 
-    int rc;
     if (fInterruptible)
         rc = RTSemEventMultiWaitNoResume(pWait->Event, cMillies);
@@ -1565 +1572 @@
 
 
-static int VBoxGuestCommonIOCtl_HGCMConnect(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, VBoxGuestHGCMConnectInfo *pInfo,
-                                            size_t *pcbDataReturned)
-{
+static int VBoxGuestCommonIOCtl_HGCMConnect(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession,
+                                            VBoxGuestHGCMConnectInfo *pInfo, size_t *pcbDataReturned)
+{
+    int rc;
+
     /*
      * The VbglHGCMConnect call will invoke the callback if the HGCM
@@ -1577 +1586 @@
          ? pInfo->Loc.u.host.achName : "<not local host>"));
 
-    int rc = VbglR0HGCMInternalConnect(pInfo, VBoxGuestHGCMAsyncWaitCallback, pDevExt, RT_INDEFINITE_WAIT);
+    rc = VbglR0HGCMInternalConnect(pInfo, VBoxGuestHGCMAsyncWaitCallback, pDevExt, RT_INDEFINITE_WAIT);
     if (RT_SUCCESS(rc))
     {
@@ -1601 +1610 @@
             {
                 static unsigned s_cErrors = 0;
+                VBoxGuestHGCMDisconnectInfo Info;
+
                 if (s_cErrors++ < 32)
                     LogRel(("VBoxGuestCommonIOCtl: HGCM_CONNECT: too many HGCMConnect calls for one session!\n"));
 
-                VBoxGuestHGCMDisconnectInfo Info;
                 Info.result = 0;
                 Info.u32ClientID = pInfo->u32ClientID;
@@ -1627 +1637 @@
     unsigned i;
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
+    int rc;
+
     RTSpinlockAcquireNoInts(pDevExt->SessionSpinlock, &Tmp);
     for (i = 0; i < RT_ELEMENTS(pSession->aHGCMClientIds); i++)
@@ -1649 +1661 @@
      */
     Log(("VBoxGuestCommonIOCtl: HGCM_DISCONNECT: u32Client=%RX32\n", pInfo->u32ClientID));
-    int rc = VbglR0HGCMInternalDisconnect(pInfo, VBoxGuestHGCMAsyncWaitCallback, pDevExt, RT_INDEFINITE_WAIT);
+    rc = VbglR0HGCMInternalDisconnect(pInfo, VBoxGuestHGCMAsyncWaitCallback, pDevExt, RT_INDEFINITE_WAIT);
     if (RT_SUCCESS(rc))
     {
@@ -1673 +1685 @@
                                          size_t cbExtra, size_t cbData, size_t *pcbDataReturned)
 {
+    size_t cbActual;
+    const uint32_t u32ClientId = pInfo->u32ClientID;
+    unsigned i;
+    int rc;
+    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
+    uint32_t fFlags;
+
     /*
      * Some more validations.
@@ -1681 +1700 @@
         return VERR_INVALID_PARAMETER;
     }
-    size_t cbActual = cbExtra + sizeof(*pInfo);
+
+    cbActual = cbExtra + sizeof(*pInfo);
 #ifdef RT_ARCH_AMD64
     if (f32bit)
@@ -1698 +1718 @@
      * Validate the client id.
      */
-    const uint32_t u32ClientId = pInfo->u32ClientID;
-    unsigned i;
-    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
     RTSpinlockAcquireNoInts(pDevExt->SessionSpinlock, &Tmp);
     for (i = 0; i < RT_ELEMENTS(pSession->aHGCMClientIds); i++)
@@ -1721 +1738 @@
      */
     Log(("VBoxGuestCommonIOCtl: HGCM_CALL: u32Client=%RX32\n", pInfo->u32ClientID));
-    int rc;
-    uint32_t fFlags = pSession->R0Process == NIL_RTR0PROCESS ? VBGLR0_HGCMCALL_F_KERNEL : VBGLR0_HGCMCALL_F_USER;
+    fFlags = pSession->R0Process == NIL_RTR0PROCESS ? VBGLR0_HGCMCALL_F_KERNEL : VBGLR0_HGCMCALL_F_USER;
 #ifdef RT_ARCH_AMD64
     if (f32bit)
@@ -1769 +1785 @@
 {
     int rc;
+    VBoxGuestHGCMConnectInfo Info;
+
     Log(("VBoxGuestCommonIOCtl: CLIPBOARD_CONNECT: Current u32ClientId=%RX32\n", pDevExt->u32ClipboardClientId));
-
 
     /*
@@ -1797 +1814 @@
      * Try connect.
      */
-    VBoxGuestHGCMConnectInfo Info;
     Info.Loc.type = VMMDevHGCMLoc_LocalHost_Existing;
     strcpy(Info.Loc.u.host.achName, "VBoxSharedClipboard");
@@ -1986 +2002 @@
                          void *pvData, size_t cbData, size_t *pcbDataReturned)
 {
+    int rc;
+
     Log(("VBoxGuestCommonIOCtl: iFunction=%#x pDevExt=%p pSession=%p pvData=%p cbData=%zu\n",
          iFunction, pDevExt, pSession, pvData, cbData));
@@ -2026 +2044 @@
      * Deal with variably sized requests first.
      */
-    int rc = VINF_SUCCESS;
+    rc = VINF_SUCCESS;
     if (VBOXGUEST_IOCTL_STRIP_SIZE(iFunction) == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_VMMREQUEST(0)))
     {
@@ -2038 +2056 @@
     else if (VBOXGUEST_IOCTL_STRIP_SIZE(iFunction) == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL(0)))
     {
+        bool fInterruptible = pSession->R0Process != NIL_RTR0PROCESS;
         CHECKRET_MIN_SIZE("HGCM_CALL", sizeof(VBoxGuestHGCMCallInfo));
-        bool fInterruptible = pSession->R0Process != NIL_RTR0PROCESS;
         rc = VBoxGuestCommonIOCtl_HGCMCall(pDevExt, pSession, (VBoxGuestHGCMCallInfo *)pvData, RT_INDEFINITE_WAIT,
                                            fInterruptible, false /*f32bit*/,
@@ -2046 +2064 @@
     else if (VBOXGUEST_IOCTL_STRIP_SIZE(iFunction) == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL_TIMED(0)))
     {
+        VBoxGuestHGCMCallInfoTimed *pInfo = (VBoxGuestHGCMCallInfoTimed *)pvData;
         CHECKRET_MIN_SIZE("HGCM_CALL_TIMED", sizeof(VBoxGuestHGCMCallInfoTimed));
-        VBoxGuestHGCMCallInfoTimed *pInfo = (VBoxGuestHGCMCallInfoTimed *)pvData;
         rc = VBoxGuestCommonIOCtl_HGCMCall(pDevExt, pSession, &pInfo->info, pInfo->u32Timeout,
                                            !!pInfo->fInterruptible || pSession->R0Process != NIL_RTR0PROCESS,
@@ -2056 +2074 @@
     else if (VBOXGUEST_IOCTL_STRIP_SIZE(iFunction) == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL_32(0)))
     {
+        bool fInterruptible = pSession->R0Process != NIL_RTR0PROCESS;
         CHECKRET_MIN_SIZE("HGCM_CALL", sizeof(VBoxGuestHGCMCallInfo));
-        bool fInterruptible = pSession->R0Process != NIL_RTR0PROCESS;
         rc = VBoxGuestCommonIOCtl_HGCMCall(pDevExt, pSession, (VBoxGuestHGCMCallInfo *)pvData, RT_INDEFINITE_WAIT,
                                            fInterruptible, true /*f32bit*/,

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

@@ -33 +33 @@
 DECLVBGL(int) VbglGRVerify (const VMMDevRequestHeader *pReq, size_t cbReq)
 {
+    size_t cbReqExpected;
+
     if (!pReq || cbReq < sizeof (VMMDevRequestHeader))
     {
@@ -46 +48 @@
 
     /* The request size must correspond to the request type. */
-    size_t cbReqExpected = vmmdevGetRequestSize(pReq->requestType);
+    cbReqExpected = vmmdevGetRequestSize(pReq->requestType);
 
     if (cbReq < cbReqExpected)

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

@@ -307 +307 @@
                     else
                     {
+                        bool fCopyIn;
+
                         if (cb > VBGLR0_MAX_HGCM_USER_PARM)
                         {
@@ -337 +339 @@
                          *        is probably going to be more massive than the current code, so
                          *        it can wait till later.   */
-                        bool fCopyIn = pSrcParm->type != VMMDevHGCMParmType_LinAddr_Out
-                                    && pSrcParm->type != VMMDevHGCMParmType_LinAddr_Locked_Out;
+                        fCopyIn =    pSrcParm->type != VMMDevHGCMParmType_LinAddr_Out
+                                  && pSrcParm->type != VMMDevHGCMParmType_LinAddr_Locked_Out;
                         if (cb <= PAGE_SIZE / 2 - 16)
                         {
@@ -813 +815 @@
                     if (cbOut)
                     {
+                        int rc2;
                         Assert(pParmInfo->aLockBufs[iLockBuf].iParm == iParm);
-                        int rc2 = RTR0MemUserCopyTo((RTR3PTR)pDstParm->u.Pointer.u.linearAddr,
-                                                    pParmInfo->aLockBufs[iLockBuf].pvSmallBuf
-                                                    ? pParmInfo->aLockBufs[iLockBuf].pvSmallBuf
-                                                    : RTR0MemObjAddress(pParmInfo->aLockBufs[iLockBuf].hObj),
-                                                    cbOut);
+                        rc2 = RTR0MemUserCopyTo((RTR3PTR)pDstParm->u.Pointer.u.linearAddr,
+                                                pParmInfo->aLockBufs[iLockBuf].pvSmallBuf
+                                                ? pParmInfo->aLockBufs[iLockBuf].pvSmallBuf
+                                                : RTR0MemObjAddress(pParmInfo->aLockBufs[iLockBuf].hObj),
+                                                cbOut);
                         if (RT_FAILURE(rc2))
                             return rc2;

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

@@ -53 +53 @@
 int vbglLockLinear (void **ppvCtx, void *pv, uint32_t u32Size, bool fWriteAccess, uint32_t fFlags)
 {
-    int rc = VINF_SUCCESS;
+    int         rc = VINF_SUCCESS;
+    RTR0MEMOBJ  MemObj = NIL_RTR0MEMOBJ;
+    uint32_t    fAccess = RTMEM_PROT_READ | (fWriteAccess ? RTMEM_PROT_WRITE : 0);
 
     /* Zero size buffers shouldn't be locked. */
@@ -106 +108 @@
      *       know they aren't pagable.
      */
-    RTR0MEMOBJ  MemObj = NIL_RTR0MEMOBJ;
-    uint32_t    fAccess = RTMEM_PROT_READ | (fWriteAccess ? RTMEM_PROT_WRITE : 0);
     if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
         rc = RTR0MemObjLockUser(&MemObj, (RTR3PTR)pv, u32Size, fAccess, NIL_RTR0PROCESS);
@@ -124 +124 @@
 void vbglUnlockLinear (void *pvCtx, void *pv, uint32_t u32Size)
 {
-    NOREF(pv);
-    NOREF(u32Size);
-
 #ifdef RT_OS_WINDOWS
     PMDL pMdl = (PMDL)pvCtx;
@@ -143 +140 @@
 
 #endif
+
+    NOREF(pv);
+    NOREF(u32Size);
 }