xserver: Branch 'master' - 3 commits

[Tiago Vignatti]

 hw/xfree86/common/xf86RandR.c  |    2 +-
 hw/xfree86/common/xf86Xinput.c |    1 -
 hw/xfree86/dri/dri.c           |    2 +-
 hw/xfree86/exa/examodule.c     |    7 -------
 hw/xfree86/loader/misym.c      |    1 -
 hw/xfree86/modes/xf86Modes.c   |    3 +--
 mi/mipointer.c                 |    6 ------
 mi/mipointer.h                 |    6 ------
 mi/misprite.c                  |    1 -
 9 files changed, 3 insertions(+), 26 deletions(-)

New commits:
commit d78bebb20a00e8519788c75c90b467a5750c78be
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date:   Fri Jul 4 04:04:19 2008 -0300

    Remove unused function and variables.

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index b98e903..498f797 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -467,7 +467,6 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
     LocalDevicePtr pInfo = (LocalDevicePtr) pDev->public.devicePrivate;
     InputDriverPtr drv;
     IDevRec *idev;
-    BOOL found;
     IDevPtr *it;
 
     if (pInfo) /* need to get these before RemoveDevice */
diff --git a/hw/xfree86/exa/examodule.c b/hw/xfree86/exa/examodule.c
index 63ea8c5..4a8d8f2 100644
--- a/hw/xfree86/exa/examodule.c
+++ b/hw/xfree86/exa/examodule.c
@@ -179,13 +179,6 @@ exaDDXDriverInit(ScreenPtr pScreen)
     
 }
 
-/*ARGSUSED*/
-static const OptionInfoRec *
-EXAAvailableOptions(void *unused)
-{
-    return (EXAOptions);
-}
-
 static XF86ModuleVersionInfo exaVersRec =
 {
 	"exa",
diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c
index 3a9f3ff..dd5ce64 100644
--- a/hw/xfree86/modes/xf86Modes.c
+++ b/hw/xfree86/modes/xf86Modes.c
@@ -526,7 +526,6 @@ xf86ValidateModesBandwidth(ScrnInfoPtr pScrn, DisplayModePtr modeList,
 _X_EXPORT void
 xf86ValidateModesReducedBlanking(ScrnInfoPtr pScrn, DisplayModePtr modeList)
 {
-    Bool mode_is_reduced = FALSE;
     DisplayModePtr mode;
 
     for (mode = modeList; mode != NULL; mode = mode->next) {
@@ -682,7 +681,7 @@ xf86GetMonitorModes (ScrnInfoPtr pScrn, XF86ConfMonitorPtr conf_monitor)
 _X_EXPORT DisplayModePtr
 xf86GetDefaultModes (Bool interlaceAllowed, Bool doubleScanAllowed)
 {
-    DisplayModePtr  head = NULL, prev = NULL, mode;
+    DisplayModePtr  head = NULL, mode;
     int		    i;
 
     for (i = 0; i < xf86NumDefaultModes; i++)
diff --git a/mi/misprite.c b/mi/misprite.c
index 6f0cbe7..122cea4 100644
--- a/mi/misprite.c
+++ b/mi/misprite.c
@@ -268,7 +268,6 @@ static Bool
 miSpriteCloseScreen (int i, ScreenPtr pScreen)
 {
     miSpriteScreenPtr   pScreenPriv;
-    DeviceIntPtr        pDev;
 
     pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
 						      miSpriteScreenKey);
commit a8c4727f01949da0ae266369f0d12a96c2bf0da5
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date:   Fri Jul 4 04:03:46 2008 -0300

    Fix typo in the last commit.

diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
index b71924f..f30674f 100644
--- a/hw/xfree86/common/xf86RandR.c
+++ b/hw/xfree86/common/xf86RandR.c
@@ -243,7 +243,7 @@ xf86RandRSetConfig (ScreenPtr		pScreen,
     Bool		    useVirtual = FALSE;
     Rotation		    oldRotation = randrp->rotation;
 
-    miPointerGetPosition(inputInfo.pointermi, &px, &py);
+    miPointerGetPosition(inputInfo.pointer, &px, &py);
     for (mode = scrp->modes; ; mode = mode->next)
     {
 	if (mode->HDisplay == pSize->width &&
commit 3164288b121990a5990747c0f92d4af13b1c929a
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date:   Fri Jul 4 03:55:59 2008 -0300

    Remove deprecated function miPointerPosition().

diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
index 4702392..b71924f 100644
--- a/hw/xfree86/common/xf86RandR.c
+++ b/hw/xfree86/common/xf86RandR.c
@@ -243,7 +243,7 @@ xf86RandRSetConfig (ScreenPtr		pScreen,
     Bool		    useVirtual = FALSE;
     Rotation		    oldRotation = randrp->rotation;
 
-    miPointerPosition (&px, &py);
+    miPointerGetPosition(inputInfo.pointermi, &px, &py);
     for (mode = scrp->modes; ; mode = mode->next)
     {
 	if (mode->HDisplay == pSize->width &&
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index ae88189..ac40e0f 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -2301,7 +2301,7 @@ DRIAdjustFrame(int scrnIndex, int x, int y, int flags)
 	pScrn->frameY1 = pScrn->frameY0 + pDRIPriv->pSAREA->frame.height - 1;
 
 				/* Fix up cursor */
-	miPointerPosition(&px, &py);
+    miPointerGetPosition(inputInfo.pointer, &px, &py);
 	if (px < pScrn->frameX0) px = pScrn->frameX0;
 	if (px > pScrn->frameX1) px = pScrn->frameX1;
 	if (py < pScrn->frameY0) py = pScrn->frameY0;
diff --git a/hw/xfree86/loader/misym.c b/hw/xfree86/loader/misym.c
index aa712c0..c754228 100644
--- a/hw/xfree86/loader/misym.c
+++ b/hw/xfree86/loader/misym.c
@@ -160,7 +160,6 @@ _X_HIDDEN void *miLookupTab[] = {
     SYMFUNC(miPutImage)
     SYMFUNC(miPushPixels)
     SYMFUNC(miPointerInitialize)
-    SYMFUNC(miPointerPosition)
     SYMFUNC(miRecolorCursor)
     SYMFUNC(miPointerWarpCursor)
     SYMFUNC(miDCInitialize)
diff --git a/mi/mipointer.c b/mi/mipointer.c
index 4763e12..809ce5e 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -560,12 +560,6 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y, unsigned long time)
 }
 
 _X_EXPORT void
-miPointerPosition (int *x, int *y)
-{
-    miPointerGetPosition(inputInfo.pointer, x, y);
-}
-
-_X_EXPORT void
 miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y)
 {
     *x = MIPOINTER(pDev)->x;
diff --git a/mi/mipointer.h b/mi/mipointer.h
index d2e4455..179e4f3 100644
--- a/mi/mipointer.h
+++ b/mi/mipointer.h
@@ -134,12 +134,6 @@ extern void miPointerAbsoluteCursor(
     unsigned long /*time*/
 ) _X_DEPRECATED;
 
-/* Deprecated in favour of miPointerGetPosition. */
-extern void miPointerPosition(
-    int * /*x*/,
-    int * /*y*/
-) _X_DEPRECATED;
-
 /* Deprecated in favour of miPointerSetScreen. */
 extern void miPointerSetNewScreen(
     int, /*screen_no*/