A coupel of unused variables, and some debug code with mis-matching printf format and variable types.
Signed-off-by: Keith Packard <kei...@keithp.com> --- mi/mieq.c | 4 ++-- mi/mipointer.c | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/mi/mieq.c b/mi/mieq.c index 4c07480..bc7f945 100644 --- a/mi/mieq.c +++ b/mi/mieq.c @@ -585,7 +585,7 @@ mieqProcessInputEvents(void) if (n_enqueued >= (miEventQueue.nevents - (2 * QUEUE_RESERVED_SIZE)) && miEventQueue.nevents < QUEUE_MAXIMUM_SIZE) { ErrorF("[mi] Increasing EQ size to %lu to prevent dropped events.\n", - miEventQueue.nevents << 1); + (unsigned long) (miEventQueue.nevents << 1)); if (!mieqGrowQueue(&miEventQueue, miEventQueue.nevents << 1)) { ErrorF("[mi] Increasing the size of EQ failed.\n"); } @@ -593,7 +593,7 @@ mieqProcessInputEvents(void) if (miEventQueue.dropped) { ErrorF("[mi] EQ processing has resumed after %lu dropped events.\n", - miEventQueue.dropped); + (unsigned long) miEventQueue.dropped); ErrorF ("[mi] This may be caused my a misbehaving driver monopolizing the server's resources.\n"); miEventQueue.dropped = 0; diff --git a/mi/mipointer.c b/mi/mipointer.c index 5d591a1..df027a7 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -352,7 +352,6 @@ miPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) miPointerPtr pPointer; BOOL changedScreen = FALSE; - SetupScreen(pScreen); pPointer = MIPOINTER(pDev); if (pPointer->pScreen != pScreen) { @@ -465,14 +464,12 @@ miPointerUpdateSprite(DeviceIntPtr pDev) void miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y) { - miPointerScreenPtr pScreenPriv; ScreenPtr pScreen; miPointerPtr pPointer; pPointer = MIPOINTER(pDev); pScreen = screenInfo.screens[screen_no]; - pScreenPriv = GetScreenPrivate(pScreen); mieqSwitchScreen(pDev, pScreen, FALSE); NewCurrentScreen(pDev, pScreen, x, y); -- 1.8.4.2 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel