Changeset 47428 in vbox

Timestamp:

Jul 26, 2013 4:19:03 PM (11 years ago)

Author:

vboxsync

Message:

Addressed some warnings.

Location:

trunk/src/VBox

Files:

• Devices/PC/DevAPIC.cpp (modified) (1 diff)
• Main/src-server/solaris/PerformanceSolaris.cpp (modified) (2 diffs)
• Main/testcase/tstMouseImpl.cpp (modified) (1 diff)
• Runtime/r0drv/solaris/alloc-r0drv-solaris.c (modified) (1 diff)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -1241 +1241 @@
     if (pu8PendingIrq)
     {
-        Assert(irrv >= 0 && irrv <= UINT8_MAX);
+        Assert(irrv >= 0 && irrv <= (int)UINT8_MAX);
         *pu8PendingIrq = (uint8_t)irrv;
     }

trunk/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp

@@ -144 +144 @@
     if (mZfsSo)
     {
-        mZfsInit        =        (PFNZFSINIT)dlsym(mZfsSo, "libzfs_init");
-        mZfsFini        =        (PFNZFSFINI)dlsym(mZfsSo, "libzfs_fini");
-        mZfsOpen        =        (PFNZFSOPEN)dlsym(mZfsSo, "zfs_open");
-        mZfsClose       =       (PFNZFSCLOSE)dlsym(mZfsSo, "zfs_close");
-        mZfsPropGetInt  =  (PFNZFSPROPGETINT)dlsym(mZfsSo, "zfs_prop_get_int");
-        mZpoolOpen      =      (PFNZPOOLOPEN)dlsym(mZfsSo, "zpool_open");
-        mZpoolClose     =     (PFNZPOOLCLOSE)dlsym(mZfsSo, "zpool_close");
-        mZpoolGetConfig = (PFNZPOOLGETCONFIG)dlsym(mZfsSo, "zpool_get_config");
-        mZpoolVdevName  =  (PFNZPOOLVDEVNAME)dlsym(mZfsSo, "zpool_vdev_name");
+        mZfsInit        =        (PFNZFSINIT)(uintptr_t)dlsym(mZfsSo, "libzfs_init");
+        mZfsFini        =        (PFNZFSFINI)(uintptr_t)dlsym(mZfsSo, "libzfs_fini");
+        mZfsOpen        =        (PFNZFSOPEN)(uintptr_t)dlsym(mZfsSo, "zfs_open");
+        mZfsClose       =       (PFNZFSCLOSE)(uintptr_t)dlsym(mZfsSo, "zfs_close");
+        mZfsPropGetInt  =  (PFNZFSPROPGETINT)(uintptr_t)dlsym(mZfsSo, "zfs_prop_get_int");
+        mZpoolOpen      =      (PFNZPOOLOPEN)(uintptr_t)dlsym(mZfsSo, "zpool_open");
+        mZpoolClose     =     (PFNZPOOLCLOSE)(uintptr_t)dlsym(mZfsSo, "zpool_close");
+        mZpoolGetConfig = (PFNZPOOLGETCONFIG)(uintptr_t)dlsym(mZfsSo, "zpool_get_config");
+        mZpoolVdevName  =  (PFNZPOOLVDEVNAME)(uintptr_t)dlsym(mZfsSo, "zpool_vdev_name");
 
         if (   mZfsInit
@@ -351 +351 @@
 uint64_t CollectorSolaris::wrapCorrection(uint32_t cur, uint64_t prev, const char *name)
 {
+    NOREF(name);
     uint64_t corrected = (prev & 0xffffffff00000000) + cur;
     if (cur < (prev & 0xffffffff))

trunk/src/VBox/Main/testcase/tstMouseImpl.cpp

@@ -190 +190 @@
     &pdmiBase,
     NULL,                    /* pDownBase */
-    NULL,                    /* IBase */
+    {                        /* IBase */
+        NULL                 /* pfnQueryInterface */
+    },
     0,                       /* fTracing */
     0,                       /* idTracing */
 #if HC_ARCH_BITS == 32
-    {
-        0                    /* au32Padding */
-    },
+    { 0 },                   /* au32Padding */
 #endif
     {
-        0                    /* Padding */
+        { 0 }                /* padding */
     },                       /* Internal */
-    {
-        0                    /* achInstanceData */
-    }
+    { 0 }                    /* achInstanceData */
 };
 

trunk/src/VBox/Runtime/r0drv/solaris/alloc-r0drv-solaris.c

@@ -74 +74 @@
     if (fFlags & RTMEMHDR_FLAG_EXEC)
     {
-        AssertReturn(!(fFlags & RTMEMHDR_FLAG_ANY_CTX), NULL);
+        AssertReturn(!(fFlags & RTMEMHDR_FLAG_ANY_CTX), VERR_NOT_SUPPORTED);
         cbAllocated = RT_ALIGN_Z(cb + sizeof(*pHdr), PAGE_SIZE) - sizeof(*pHdr);
         pHdr = (PRTMEMHDR)segkmem_alloc(heaptext_arena, cbAllocated + sizeof(*pHdr), KM_SLEEP);