Changeset 63480 in vbox for trunk/src

Timestamp:

Aug 15, 2016 2:17:54 PM (8 years ago)

Author:

vboxsync

Message:

Devices: warnings (clang)

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA-SVGA3d-cocoa.m (modified) (5 diffs)
• Graphics/DevVGA.cpp (modified) (7 diffs)
• Storage/DevLsiLogicSCSI.cpp (modified) (4 diffs)
• USB/darwin/USBProxyDevice-darwin.cpp (modified) (14 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.m

@@ -280 +280 @@
     self = [super initWithFrame:frame pixelFormat:pFmt];
 #else
+    RT_NOREF(pFmt);
     m_cSetViewAttempts = 0;
     m_pCtx = NULL;
@@ -477 +478 @@
 - (void)vboxBoundsDidChange:(NSNotification *)pNotification
 {
+    RT_NOREF(pNotification);
     LogFlow(("OvlView(%p) vboxBoundsDidChange:\n", (void *)self));
     self->m_fUpdateCtx = true;
@@ -488 +490 @@
 - (void)vboxFrameDidChange:(NSNotification *)pNotification
 {
+    RT_NOREF(pNotification);
     LogFlow(("OvlView(%p) vboxFrameDidChange:\n", (void *)self));
     self->m_fUpdateCtx = true;
@@ -500 +503 @@
 - (void)vboxFrameDidChangeGlobal:(NSNotification *)pNotification
 {
+    RT_NOREF(pNotification);
     LogFlow(("OvlView(%p) vboxFrameDidChangeGlobal:\n", (void *)self));
     self->m_fUpdateCtx = true;
@@ -664 +668 @@
 - (void)drawRect:(NSRect)rect
 {
+    RT_NOREF(rect);
 //    if (m_fClear)
 //    {

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -340 +340 @@
 }
 
+#ifdef IN_RING3
 /**
  * Reset dirty flags in a give range.
@@ -354 +355 @@
     ASMBitClearRange(&pThis->au32DirtyBitmap[0], offVRAMStart >> PAGE_SHIFT, offVRAMEnd >> PAGE_SHIFT);
 }
+#endif /* IN_RING3 */
 
 #ifdef _MSC_VER
@@ -447 +449 @@
 #endif
 
+#ifdef IN_RING3
+
 static const uint32_t dmask16[16] = {
     PAT(0x00000000),
@@ -473 +477 @@
 };
 
-#if defined(IN_RING3)
 static uint32_t expand4[256];
 static uint16_t expand2[256];
 static uint8_t expand4to8[16];
+
 #endif /* IN_RING3 */
 
@@ -1518 +1522 @@
 }
 
-#if defined(IN_RING3)
+#ifdef IN_RING3
+
 typedef void vga_draw_glyph8_func(uint8_t *d, int linesize,
                                   const uint8_t *font_ptr, int h,
@@ -2152 +2157 @@
 }
 
-#ifdef VBOX_WITH_VMSVGA
+# ifdef VBOX_WITH_VMSVGA
+
 int vgaR3UpdateDisplay(VGAState *s, unsigned xStart, unsigned yStart, unsigned cx, unsigned cy)
 {
@@ -2332 +2338 @@
     return VINF_SUCCESS;
 }
-#endif /* VBOX_WITH_VMSVGA */
+
+# endif /* VBOX_WITH_VMSVGA */
 
 /*

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

@@ -496 +496 @@
 }
 
+
+#ifdef IN_RING3
 /**
  * Sets the I/O controller into fault state and sets the fault code.
@@ -514 +516 @@
         LogFunc(("We are already in FAULT state\n"));
 }
+#endif /* IN_RING3 */
+
 
 /**
@@ -533 +537 @@
 }
 
+#ifdef IN_RING3
+
 /**
  * Returns the number of free entries in the reply post queue.
@@ -551 +557 @@
 }
 
-#ifdef IN_RING3
 
 /**

trunk/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp

@@ -264 +264 @@
 /** The IO Master Port.
  * Not worth cleaning up.  */
-static mach_port_t  g_MasterPort = NULL;
+static mach_port_t  g_MasterPort = MACH_PORT_NULL;
 
 
@@ -273 +273 @@
  *
  * @param   pvUser1     NULL, ignored.
- * @param   pvUser2     NULL, ignored.
  */
 static DECLCALLBACK(int32_t) usbProxyDarwinInitOnce(void *pvUser1)
 {
+    RT_NOREF(pvUser1);
+
     int rc;
     kern_return_t krc = IOMasterPort(MACH_PORT_NULL, &g_MasterPort);
@@ -818 +819 @@
      * Create a interface enumerator for all the interface (current config).
      */
-    io_iterator_t Interfaces = NULL;
+    io_iterator_t Interfaces = IO_OBJECT_NULL;
     IOUSBFindInterfaceRequest Req;
     Req.bInterfaceClass    = kIOUSBFindInterfaceDontCare;
@@ -844 +845 @@
                                                     kIOCFPlugInInterfaceID, &ppPlugInInterface, &Score);
             IOObjectRelease(Interface);
-            Interface = NULL;
+            Interface = IO_OBJECT_NULL;
             if (krc == KERN_SUCCESS)
             {
@@ -1080 +1081 @@
 static DECLCALLBACK(void) usbProxyDarwinPerformWakeup(void *pInfo)
 {
+    RT_NOREF(pInfo);
     return;
 }
@@ -1099 +1101 @@
 static DECLCALLBACK(int) usbProxyDarwinOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress, void *pvBackend)
 {
-    int vrc;
+    RT_NOREF(pvBackend);
     LogFlow(("usbProxyDarwinOpen: pProxyDev=%p pszAddress=%s\n", pProxyDev, pszAddress));
 
@@ -1105 +1107 @@
      * Init globals once.
      */
-    vrc = RTOnce(&g_usbProxyDarwinOnce, usbProxyDarwinInitOnce, NULL);
+    int vrc = RTOnce(&g_usbProxyDarwinOnce, usbProxyDarwinInitOnce, NULL);
     AssertRCReturn(vrc, vrc);
 
@@ -1122 +1124 @@
      */
     CFMutableDictionaryRef RefMatchingDict = IOServiceMatching(kIOUSBDeviceClassName);
-    AssertReturn(RefMatchingDict, NULL);
+    AssertReturn(RefMatchingDict != IO_OBJECT_NULL, VERR_OPEN_FAILED);
 
     uint64_t u64SessionId = 0;
@@ -1162 +1164 @@
     } while (*psz);
 
-    io_iterator_t USBDevices = NULL;
+    io_iterator_t USBDevices = IO_OBJECT_NULL;
     IOReturn irc = IOServiceGetMatchingServices(g_MasterPort, RefMatchingDict, &USBDevices);
-    AssertMsgReturn(irc == kIOReturnSuccess, ("irc=%#x\n", irc), NULL);
+    AssertMsgReturn(irc == kIOReturnSuccess, ("irc=%#x\n", irc), RTErrConvertFromDarwinIO(irc));
     RefMatchingDict = NULL; /* the reference is consumed by IOServiceGetMatchingServices. */
 
@@ -1194 +1196 @@
     }
     IOObjectRelease(USBDevices);
-    USBDevices = NULL;
+    USBDevices = IO_OBJECT_NULL;
     if (!USBDevice)
     {
@@ -1404 +1406 @@
     pDevOsX->ppDevI = NULL;
     kern_return_t krc = IOObjectRelease(pDevOsX->USBDevice); Assert(krc == KERN_SUCCESS); NOREF(krc);
-    pDevOsX->USBDevice = NULL;
+    pDevOsX->USBDevice = IO_OBJECT_NULL;
     pDevOsX->pProxyDev = NULL;
 
@@ -1432 +1434 @@
 static DECLCALLBACK(int) usbProxyDarwinReset(PUSBPROXYDEV pProxyDev, bool fResetOnLinux)
 {
+    RT_NOREF(fResetOnLinux);
     PUSBPROXYDEVOSX pDevOsX = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVOSX);
     LogFlow(("usbProxyDarwinReset: pProxyDev=%s\n", pProxyDev->pUsbIns->pszName));
@@ -1497 +1500 @@
 static DECLCALLBACK(int) usbProxyDarwinClaimInterface(PUSBPROXYDEV pProxyDev, int iIf)
 {
+    RT_NOREF(pProxyDev, iIf);
     return VINF_SUCCESS;
 }
@@ -1511 +1515 @@
 static DECLCALLBACK(int) usbProxyDarwinReleaseInterface(PUSBPROXYDEV pProxyDev, int iIf)
 {
+    RT_NOREF(pProxyDev, iIf);
     return VINF_SUCCESS;
 }