Changeset 25181 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Dec 4, 2009 10:38:46 AM (15 years ago)

Author:

vboxsync

Message:

Fix warnings.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.c (modified) (1 diff)
• SUPR0IdcClientStubs.c (modified) (4 diffs)
• solaris/SUPDrv-solaris.c (modified) (5 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -842 +842 @@
             if (pBundle->aMem[i].MemObj != NIL_RTR0MEMOBJ)
             {
-                int rc;
                 Log2(("eType=%d pvR0=%p pvR3=%p cb=%ld\n", pBundle->aMem[i].eType, RTR0MemObjAddress(pBundle->aMem[i].MemObj),
                       (void *)RTR0MemObjAddressR3(pBundle->aMem[i].MapObjR3), (long)RTR0MemObjSize(pBundle->aMem[i].MemObj)));

trunk/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c

@@ -81 +81 @@
 SUPR0DECL(void *) SUPR0ObjRegister(PSUPDRVSESSION pSession, SUPDRVOBJTYPE enmType, PFNSUPDRVDESTRUCTOR pfnDestructor, void *pvUser1, void *pvUser2)
 {
-    static DECLCALLBACKPTR(void *, s_pfn)(PSUPDRVSESSION pSession, SUPDRVOBJTYPE enmType, PFNSUPDRVDESTRUCTOR pfnDestructor, void *pvUser1, void *pvUser2);
-    DECLCALLBACKPTR(void *,          pfn)(PSUPDRVSESSION pSession, SUPDRVOBJTYPE enmType, PFNSUPDRVDESTRUCTOR pfnDestructor, void *pvUser1, void *pvUser2);
+    static DECLCALLBACKPTR(void *, s_pfn)(PSUPDRVSESSION /* pSession */, SUPDRVOBJTYPE /* enmType */, PFNSUPDRVDESTRUCTOR /* pfnDestructor */, void * /* pvUser1 */, void * /* pvUser2 */);
+    DECLCALLBACKPTR(void *,          pfn)(PSUPDRVSESSION /* pSession */, SUPDRVOBJTYPE /* enmType */, PFNSUPDRVDESTRUCTOR /* pfnDestructor */, void * /* pvUser1 */, void * /* pvUser2 */);
     pfn = s_pfn;
     if (!pfn)
@@ -98 +98 @@
 SUPR0DECL(int) SUPR0ObjAddRef(void *pvObj, PSUPDRVSESSION pSession)
 {
-    static DECLCALLBACKPTR(int, s_pfn)(void *pvObj, PSUPDRVSESSION pSession);
-    DECLCALLBACKPTR(int,          pfn)(void *pvObj, PSUPDRVSESSION pSession);
+    static DECLCALLBACKPTR(int, s_pfn)(void * /* pvObj */, PSUPDRVSESSION /* pSession */);
+    DECLCALLBACKPTR(int,          pfn)(void * /* pvObj */, PSUPDRVSESSION /* pSession */);
     pfn = s_pfn;
     if (!pfn)
@@ -115 +115 @@
 SUPR0DECL(int) SUPR0ObjRelease(void *pvObj, PSUPDRVSESSION pSession)
 {
-    static DECLCALLBACKPTR(int, s_pfn)(void *pvObj, PSUPDRVSESSION pSession);
-    DECLCALLBACKPTR(int,          pfn)(void *pvObj, PSUPDRVSESSION pSession);
+    static DECLCALLBACKPTR(int, s_pfn)(void * /* pvObj */, PSUPDRVSESSION /* pSession */);
+    DECLCALLBACKPTR(int,          pfn)(void * /* pvObj */, PSUPDRVSESSION /* pSession */);
     pfn = s_pfn;
     if (!pfn)
@@ -132 +132 @@
 SUPR0DECL(int) SUPR0ObjVerifyAccess(void *pvObj, PSUPDRVSESSION pSession, const char *pszObjName)
 {
-    static DECLCALLBACKPTR(int, s_pfn)(void *pvObj, PSUPDRVSESSION pSession, const char *pszObjName);
-    DECLCALLBACKPTR(int,          pfn)(void *pvObj, PSUPDRVSESSION pSession, const char *pszObjName);
+    static DECLCALLBACKPTR(int, s_pfn)(void * /* pvObj */, PSUPDRVSESSION /* pSession */, const char * /* pszObjName */);
+    DECLCALLBACKPTR(int,          pfn)(void * /* pvObj */, PSUPDRVSESSION /* pSession */, const char * /* pszObjName */);
     pfn = s_pfn;
     if (!pfn)

trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c

@@ -150 +150 @@
 static struct modlinkage g_VBoxDrvSolarisModLinkage =
 {
-    MODREV_1,               /* loadable module system revision */
-    &g_VBoxDrvSolarisModule,
-    NULL                    /* terminate array of linkage structures */
+    MODREV_1,                     /* loadable module system revision */
+    {
+        &g_VBoxDrvSolarisModule,
+        NULL                     /* terminate array of linkage structures */
+    }
 };
 
@@ -220 +222 @@
             if (RT_SUCCESS(rc))
             {
-                int rc = ddi_soft_state_init(&g_pVBoxDrvSolarisState, sizeof(vbox_devstate_t), 8);
+                rc = ddi_soft_state_init(&g_pVBoxDrvSolarisState, sizeof(vbox_devstate_t), 8);
                 if (!rc)
                 {
@@ -378 +380 @@
 static int VBoxDrvSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t enmCmd)
 {
-    int rc = VINF_SUCCESS;
-
     LogFlow((DEVICE_NAME ":VBoxDrvSolarisDetach\n"));
     switch (enmCmd)
@@ -385 +385 @@
         case DDI_DETACH:
         {
-            int instance = ddi_get_instance(pDip);
 #ifndef USE_SESSION_HASH
             ddi_remove_minor_node(pDip, NULL);
 #else
+            int instance = ddi_get_instance(pDip);
             vbox_devstate_t *pState = ddi_get_soft_state(g_pVBoxDrvSolarisState, instance);
             ddi_remove_minor_node(pDip, NULL);
@@ -512 +512 @@
 
     *pDev = makedevice(getmajor(*pDev), instance);
+#endif
 
     return VBoxSupDrvErr2SolarisErr(rc);
-#endif
 }