Changeset 69066 in vbox

Timestamp:

Oct 12, 2017 7:03:30 PM (7 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: Consistently use RT_NOREF rather than NOREF or (void).
bugref:9017: Additions/x11: put vboxvideo into upstream X.Org

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• pointer.c (modified) (1 diff)
• vboxvideo.c (modified) (11 diffs)
• vbva.c (modified) (2 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/pointer.c

@@ -179 +179 @@
 vbox_set_cursor_colors(ScrnInfoPtr pScrn, int bg, int fg)
 {
-    NOREF(pScrn);
-    NOREF(bg);
-    NOREF(fg);
+    RT_NOREF(pScrn);
+    RT_NOREF(bg);
+    RT_NOREF(fg);
     /* ErrorF("vbox_set_cursor_colors NOT IMPLEMENTED\n"); */
 }

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

@@ -397 +397 @@
 static Bool
 vbox_crtc_lock (xf86CrtcPtr crtc)
-{ (void) crtc; return FALSE; }
+{ RT_NOREF(crtc); return FALSE; }
 
 
@@ -409 +409 @@
 vbox_crtc_mode_fixup (xf86CrtcPtr crtc, DisplayModePtr mode,
                       DisplayModePtr adjusted_mode)
-{ (void) crtc; (void) mode; (void) adjusted_mode; return TRUE; }
+{ RT_NOREF(crtc, mode, adjusted_mode); return TRUE; }
 
 static void
 vbox_crtc_stub (xf86CrtcPtr crtc)
-{ (void) crtc; }
+{ RT_NOREF(crtc); }
 
 static void
@@ -419 +419 @@
                     DisplayModePtr adjusted_mode, int x, int y)
 {
-    (void) mode;
+    RT_NOREF(mode);
     VBOXPtr pVBox = VBOXGetRec(crtc->scrn);
     unsigned cDisplay = (uintptr_t)crtc->driver_private;
@@ -436 +436 @@
 vbox_crtc_gamma_set (xf86CrtcPtr crtc, CARD16 *red,
                      CARD16 *green, CARD16 *blue, int size)
-{ (void) crtc; (void) red; (void) green; (void) blue; (void) size; }
+{ RT_NOREF(crtc, red, green, blue, size); }
 
 static void *
 vbox_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height)
-{ (void) crtc; (void) width; (void) height; return NULL; }
+{ RT_NOREF(crtc, width, height); return NULL; }
 
 static const xf86CrtcFuncsRec VBOXCrtcFuncs = {
@@ -467 +467 @@
 static void
 vbox_output_stub (xf86OutputPtr output)
-{ (void) output; }
+{ RT_NOREF(output); }
 
 static void
 vbox_output_dpms (xf86OutputPtr output, int mode)
 {
-    (void)output; (void)mode;
+    RT_NOREF(output, mode);
 }
 
@@ -484 +484 @@
 vbox_output_mode_fixup (xf86OutputPtr output, DisplayModePtr mode,
                         DisplayModePtr adjusted_mode)
-{ (void) output; (void) mode; (void) adjusted_mode; return TRUE; }
+{ RT_NOREF(output, mode, adjusted_mode); return TRUE; }
 
 static void
 vbox_output_mode_set (xf86OutputPtr output, DisplayModePtr mode,
                         DisplayModePtr adjusted_mode)
-{ (void) output; (void) mode; (void) adjusted_mode; }
+{ RT_NOREF(output, mode, adjusted_mode); }
 
 /* A virtual monitor is always connected. */
@@ -675 +675 @@
 
 static Bool VBOXEnterVTIndex(int scrnIndex, int flags)
-{ (void) flags; return VBOXEnterVT(xf86Screens[scrnIndex]); }
+{ RT_NOREF(flags); return VBOXEnterVT(xf86Screens[scrnIndex]); }
 
 static void VBOXLeaveVTIndex(int scrnIndex, int flags)
-{ (void) flags; VBOXLeaveVT(xf86Screens[scrnIndex]); }
+{ RT_NOREF(flags); VBOXLeaveVT(xf86Screens[scrnIndex]); }
 
 static Bool VBOXCloseScreenIndex(int scrnIndex, ScreenPtr pScreen)
-{ (void) scrnIndex; return VBOXCloseScreen(pScreen); }
+{ RT_NOREF(scrnIndex); return VBOXCloseScreen(pScreen); }
 
 static Bool VBOXSwitchModeIndex(int scrnIndex, DisplayModePtr pMode, int flags)
-{ (void) flags; return VBOXSwitchMode(xf86Screens[scrnIndex], pMode); }
+{ RT_NOREF(flags); return VBOXSwitchMode(xf86Screens[scrnIndex], pMode); }
 
 static void VBOXAdjustFrameIndex(int scrnIndex, int x, int y, int flags)
-{ (void) flags; VBOXAdjustFrame(xf86Screens[scrnIndex], x, y); }
+{ RT_NOREF(flags); VBOXAdjustFrame(xf86Screens[scrnIndex], x, y); }
 
 static void VBOXFreeScreenIndex(int scrnIndex, int flags)
-{ (void) flags; VBOXFreeScreen(xf86Screens[scrnIndex]); }
+{ RT_NOREF(flags); VBOXFreeScreen(xf86Screens[scrnIndex]); }
 # else
 # define SCRNINDEXAPI(pfn) pfn
@@ -990 +990 @@
           LOCO *colors, VisualPtr pVisual)
 {
-    (void)pScrn; (void) numColors; (void) indices; (void) colors;
-    (void)pVisual;
+    RT_NOREF(pScrn, numColors, indices, colors, pVisual);
 }
 
@@ -1361 +1360 @@
 
 static void VBOXAdjustFrame(ScrnInfoPtr pScrn, int x, int y)
-{ (void)pScrn; (void)x; (void)y; }
+{ RT_NOREF(pScrn, x, y); }
 
 static void VBOXFreeScreen(ScrnInfoPtr pScrn)
@@ -1425 +1424 @@
 VBOXSaveScreen(ScreenPtr pScreen, int mode)
 {
-    (void)pScreen; (void)mode;
+    RT_NOREF(pScreen, mode);
     return TRUE;
 }
@@ -1467 +1466 @@
 VBOXDisplayPowerManagementSet(ScrnInfoPtr pScrn, int mode, int flags)
 {
-    (void)pScrn; (void)mode; (void) flags;
-}
-#endif
+    RT_NOREF(pScrn, mode, flags);
+}
+#endif

trunk/src/VBox/Additions/x11/vboxvideo/vbva.c

@@ -101 +101 @@
 static DECLCALLBACK(void *) hgsmiEnvAlloc(void *pvEnv, HGSMISIZE cb)
 {
-    NOREF(pvEnv);
+    RT_NOREF(pvEnv);
     return calloc(1, cb);
 }
@@ -107 +107 @@
 static DECLCALLBACK(void) hgsmiEnvFree(void *pvEnv, void *pv)
 {
-    NOREF(pvEnv);
+    RT_NOREF(pvEnv);
     free(pv);
 }