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

Timestamp:

Feb 8, 2007 10:31:15 AM (18 years ago)

Author:

vboxsync

Message:

Prevent some warnings as these files are compiled as .c files on Linux now.

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• HGCM.cpp (modified) (6 diffs)
• HGCMInternal.cpp (modified) (6 diffs)
• Init.cpp (modified) (2 diffs)
• PhysHeap.cpp (modified) (2 diffs)

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

@@ -91 +91 @@
     struct VBGLHGCMHANDLEDATA *p;
     int rc = vbglHandleHeapEnter ();
+    uint32_t i;
 
     if (VBOX_FAILURE (rc))
-    {
         return NULL;
-    }
 
     p = NULL;
@@ -102 +101 @@
      * @todo bitmap for faster search and other obvious optimizations.
      */
-
-    uint32_t i;
 
     for (i = 0; i < ELEMENTS(g_vbgldata.aHGCMHandleData); i++)
@@ -110 +107 @@
         {
             p = &g_vbgldata.aHGCMHandleData[i];
-
             p->fAllocated = 1;
-
             break;
         }
@@ -130 +125 @@
 
     if (!pHandle)
-    {
        return;
-    }
 
     rc = vbglHandleHeapEnter ();
 
     if (VBOX_FAILURE (rc))
-    {
         return;
-    }
 
     VBGL_HGCM_ASSERTMsg(pHandle->fAllocated,
@@ -145 +136 @@
 
     memset(pHandle, 0, sizeof (struct VBGLHGCMHANDLEDATA));
-
     vbglHandleHeapLeave ();
-
     return;
 }
@@ -157 +146 @@
 
     if (!pHandle || !pData)
-    {
         return VERR_INVALID_PARAMETER;
-    }
 
     pHandleData = vbglHGCMHandleAlloc ();

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

@@ -55 +55 @@
 {
     VMMDevHGCMConnect *pHGCMConnect;
+    int rc;
+
     if (!pConnectInfo || !pAsyncCallback)
     {
@@ -63 +65 @@
 
     /* Allocate request */
-    int rc = VbglGRAlloc ((VMMDevRequestHeader **)&pHGCMConnect, sizeof (VMMDevHGCMConnect), VMMDevReq_HGCMConnect);
+    rc = VbglGRAlloc ((VMMDevRequestHeader **)&pHGCMConnect, sizeof (VMMDevHGCMConnect), VMMDevReq_HGCMConnect);
 
     if (VBOX_SUCCESS(rc))
@@ -104 +106 @@
 {
     VMMDevHGCMDisconnect *pHGCMDisconnect;
+    int rc;
+
     if (!pDisconnectInfo || !pAsyncCallback)
     {
@@ -112 +116 @@
 
     /* Allocate request */
-    int rc = VbglGRAlloc ((VMMDevRequestHeader **)&pHGCMDisconnect, sizeof (VMMDevHGCMDisconnect), VMMDevReq_HGCMDisconnect);
+    rc = VbglGRAlloc ((VMMDevRequestHeader **)&pHGCMDisconnect, sizeof (VMMDevHGCMDisconnect), VMMDevReq_HGCMDisconnect);
 
     if (VBOX_SUCCESS(rc))
@@ -147 +151 @@
 {
     VMMDevHGCMCall *pHGCMCall;
+    uint32_t cbParms;
+    int rc;
+
     if (!pCallInfo || !pAsyncCallback)
     {
@@ -156 +163 @@
     pHGCMCall = NULL;
 
-    uint32_t cbParms = pCallInfo->cParms * sizeof (HGCMFunctionParameter);
+    cbParms = pCallInfo->cParms * sizeof (HGCMFunctionParameter);
 
     /* Allocate request */
-    int rc = VbglGRAlloc ((VMMDevRequestHeader **)&pHGCMCall, sizeof (VMMDevHGCMCall) + cbParms, VMMDevReq_HGCMCall);
+    rc = VbglGRAlloc ((VMMDevRequestHeader **)&pHGCMCall, sizeof (VMMDevHGCMCall) + cbParms, VMMDevReq_HGCMCall);
 
     dprintf (("VbglHGCMCall Allocated gr %p, rc = %Vrc, cbParms = %d\n", pHGCMCall, rc, cbParms));

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

@@ -86 +86 @@
 int VbglEnter (void)
 {
+    int rc;
+
 #ifndef VBGL_VBOXGUEST
     if (g_vbgldata.status == VbglStatusInitializing)
@@ -93 +95 @@
 #endif
 
-    int rc = g_vbgldata.status != VbglStatusNotInitialized? VINF_SUCCESS: VERR_VBGL_NOT_INITIALIZED;
+    rc = g_vbgldata.status != VbglStatusNotInitialized? VINF_SUCCESS: VERR_VBGL_NOT_INITIALIZED;
     
     // dprintf(("VbglEnter: rc = %d\n", rc));

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

@@ -387 +387 @@
 DECLVBGL(void *) VbglPhysHeapAlloc (uint32_t cbSize)
 {
-    VBGLPHYSHEAPBLOCK *pBlock;
+    VBGLPHYSHEAPBLOCK *pBlock, *iter;
     int rc = vbglPhysHeapEnter ();
 
@@ -400 +400 @@
 
     /* If there are free blocks in the heap, look at them. */
-    VBGLPHYSHEAPBLOCK *iter = g_vbgldata.pFreeBlocksHead;
+    iter = g_vbgldata.pFreeBlocksHead;
 
     /* There will be not many blocks in the heap, so