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

Timestamp:

Aug 9, 2016 4:13:14 PM (8 years ago)

Author:

vboxsync

Message:

GA/X11: warnings

Location:

trunk/src/VBox/Additions/x11

Files:

• vboxmouse/vboxmouse.c (modified) (1 diff)
• vboxvideo/edid.c (modified) (1 diff)
• vboxvideo/getmode.c (modified) (2 diffs)
• vboxvideo/pointer.c (modified) (4 diffs)
• vboxvideo/vboxvideo.c (modified) (17 diffs)

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

@@ -103 +103 @@
 {
     CARD8 map[2] = { 0, 1 };
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
     Atom axis_labels[2] = { 0, 0 };
     Atom button_labels[2] = { 0, 0 };
+#endif
     if (!InitPointerDeviceStruct((DevicePtr)device, map, 2,
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

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

@@ -143 +143 @@
 Bool VBOXEDIDSet(xf86OutputPtr output, DisplayModePtr pmode)
 {
-    int i, j;
     unsigned char *pch, *pchEDID;
     xf86MonPtr pEDIDMon;

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

@@ -125 +125 @@
 void vboxAddModes(ScrnInfoPtr pScrn)
 {
-    unsigned cx = 0, cy = 0, cIndex = 0;
+    unsigned cx = 0;
+    unsigned cy = 0;
     unsigned i;
     DisplayModePtr pMode;
@@ -237 +238 @@
 static void acpiEventHandler(int fd, void *pvData)
 {
-    ScreenPtr pScreen = (ScreenPtr)pvData;
-    VBOXPtr pVBox = VBOXGetRec(xf86Screens[pScreen->myNum]);
     struct input_event event;
     ssize_t rc;
+    RT_NOREF(pvData);
 
     do

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

@@ -128 +128 @@
 {
     int rc;
+    RT_NOREF(pScrn);
 
     rc = VBoxHGSMIUpdatePointerShape(&pVBox->guestCtx, 0, 0, 0, 0, 0, NULL, 0);
@@ -137 +138 @@
 {
     int rc;
+    RT_NOREF(pScrn);
 
     if (!pVBox->fUseHardwareCursor)
@@ -152 +154 @@
     struct vboxCursorImage *pImage;
     pImage = (struct vboxCursorImage *)pvImage;
+    RT_NOREF(pScrn);
 
 #ifdef DEBUG_POINTER
@@ -211 +214 @@
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     VBOXPtr pVBox = pScrn->driverPrivate;
+    RT_NOREF(pCurs);
     return pVBox->fUseHardwareCursor;
 }

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

@@ -116 +116 @@
 static void VBOXLeaveVT(ScrnInfoPtr pScrn);
 static Bool VBOXCloseScreen(ScreenPtr pScreen);
+#ifndef VBOXVIDEO_13
 static Bool VBOXSaveScreen(ScreenPtr pScreen, int mode);
+#endif
 static Bool VBOXSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr pMode);
 static void VBOXAdjustFrame(ScrnInfoPtr pScrn, int x, int y);
 static void VBOXFreeScreen(ScrnInfoPtr pScrn);
-static void VBOXDisplayPowerManagementSet(ScrnInfoPtr pScrn, int mode,
-                                          int flags);
+#ifndef VBOXVIDEO_13
+static void VBOXDisplayPowerManagementSet(ScrnInfoPtr pScrn, int mode, int flags);
+#endif
 
 /* locally used functions */
@@ -290 +293 @@
 }
 
-/** Set a video mode to the hardware, RandR 1.1 version.  Since we no longer do
- * virtual frame buffers, adjust the screen pixmap dimensions to match.  The
- * "override" parameters are for when we received a mode hint while switched to
- * a virtual terminal.  In this case VBoxClient will have told us about the
- * mode, but not yet been able to do a mode switch using RandR.  We solve this
- * by setting the requested mode to the host but keeping the virtual frame-
+#ifndef VBOXVIDEO_13
+/** Set a video mode to the hardware, RandR 1.1 version.
+ *
+ * Since we no longer do virtual frame buffers, adjust the screen pixmap
+ * dimensions to match.  The "override" parameters are for when we received a
+ * mode hint while switched to a virtual terminal.  In this case VBoxClient will
+ * have told us about the mode, but not yet been able to do a mode switch using
+ * RandR.  We solve this by setting the requested mode to the host but keeping
+ * the virtual frame-
  * buffer matching what the X server expects. */
 static void setModeRandR11(ScrnInfoPtr pScrn, DisplayModePtr pMode, bool fScreenInitTime, bool fEnterVTTime,
@@ -332 +338 @@
     pScrn->currentMode = pMode;
 }
+#endif
 
 #ifdef VBOXVIDEO_13
@@ -552 +559 @@
 vbox_output_get_modes (xf86OutputPtr output)
 {
-    unsigned cIndex = 0;
     DisplayModePtr pModes = NULL;
     DisplayModePtr pPreferred = NULL;
@@ -636 +642 @@
 {
     static Bool Initialised = FALSE;
+    RT_NOREF(Options, ErrorMinor);
 
     if (!Initialised)
@@ -666 +673 @@
 VBOXAvailableOptions(int chipid, int busid)
 {
+    RT_NOREF(chipid, busid);
     return (VBOXOptions);
 }
@@ -672 +680 @@
 VBOXIdentify(int flags)
 {
+    RT_NOREF(flags);
     xf86PrintChipsets(VBOX_NAME, "guest driver for VirtualBox", VBOXChipsets);
 }
@@ -677 +686 @@
 #ifndef XF86_SCRN_INTERFACE
 # define SCRNINDEXAPI(pfn) pfn ## Index
-static Bool VBOXScreenInitIndex(int scrnIndex, ScreenPtr pScreen, int argc,
-                                char **argv)
-{ return VBOXScreenInit(pScreen, argc, argv); }
+static Bool VBOXScreenInitIndex(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+{
+    RT_NOREF(scrnIndex);
+    return VBOXScreenInit(pScreen, argc, argv);
+}
 
 static Bool VBOXEnterVTIndex(int scrnIndex, int flags)
@@ -996 +1007 @@
 {
     VBOXPtr pVBox = VBOXGetRec(pScrn);
-    size_t cData;
-    int32_t *paData;
-    int rc;
 
     if (!pVBox->fHaveHGSMIModeHints)
@@ -1030 +1038 @@
 static void setSizesAndCursorIntegration(ScrnInfoPtr pScrn, bool fScreenInitTime)
 {
-    VBOXPtr pVBox = VBOXGetRec(pScrn);
-
     TRACE_LOG("fScreenInitTime=%d\n", (int)fScreenInitTime);
 #ifdef VBOXVIDEO_13
@@ -1054 +1060 @@
 {
     ScrnInfoPtr pScrn = (ScrnInfoPtr)pData;
-    VBOXPtr pVBox = VBOXGetRec(pScrn);
     bool fNeedUpdate = false;
 
@@ -1084 +1089 @@
     VBOXPtr pVBox = VBOXGetRec(pScrn);
     VisualPtr visual;
+    RT_NOREF(argc, argv);
 
     TRACE_ENTRY();
@@ -1208 +1214 @@
         return FALSE;
     }
-#else
+#else  /* !VBOXVIDEO_13 */
     /* set first video mode */
     setModeRandR11(pScrn, pScrn->currentMode, true, false, 0, 0);
-#endif
+#endif /* !VBOXVIDEO_13 */
 
     /* Say that we support graphics. */
@@ -1287 +1293 @@
 static void VBOXLeaveVT(ScrnInfoPtr pScrn)
 {
-    VBOXPtr pVBox = VBOXGetRec(pScrn);
 #ifdef VBOXVIDEO_13
+    VBOXPtr pVBox = VBOXGetRec(pScrn);
     unsigned i;
 #else
@@ -1422 +1428 @@
 }
 
+#ifndef VBOXVIDEO_13
 static Bool
 VBOXSaveScreen(ScreenPtr pScreen, int mode)
@@ -1428 +1435 @@
     return TRUE;
 }
+#endif
 
 void
@@ -1462 +1470 @@
 }
 
+#ifndef VBOXVIDEO_13
 static void
-VBOXDisplayPowerManagementSet(ScrnInfoPtr pScrn, int mode,
-                int flags)
+VBOXDisplayPowerManagementSet(ScrnInfoPtr pScrn, int mode, int flags)
 {
     (void)pScrn; (void)mode; (void) flags;
 }
+#endif