frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up warnings in mi. 

A coupel of unused variables, and some debug code with mis-matching
printf format and variable types.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Keith Packard 2013-11-15 22:00:29 +09:00
parent d89b42bda4
commit c706fb0db8
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mi/mieq.c
View File

@ -585,7 +585,7 @@ mieqProcessInputEvents(void)
if (n_enqueued >= (miEventQueue.nevents - (2 * QUEUE_RESERVED_SIZE)) && if (n_enqueued >= (miEventQueue.nevents - (2 * QUEUE_RESERVED_SIZE)) &&
miEventQueue.nevents < QUEUE_MAXIMUM_SIZE) { miEventQueue.nevents < QUEUE_MAXIMUM_SIZE) {
ErrorF("[mi] Increasing EQ size to %lu to prevent dropped events.\n", 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)) { if (!mieqGrowQueue(&miEventQueue, miEventQueue.nevents << 1)) {
ErrorF("[mi] Increasing the size of EQ failed.\n"); ErrorF("[mi] Increasing the size of EQ failed.\n");
} }
@ -593,7 +593,7 @@ mieqProcessInputEvents(void)
if (miEventQueue.dropped) { if (miEventQueue.dropped) {
ErrorF("[mi] EQ processing has resumed after %lu dropped events.\n", ErrorF("[mi] EQ processing has resumed after %lu dropped events.\n",
miEventQueue.dropped); (unsigned long) miEventQueue.dropped);
ErrorF ErrorF
("[mi] This may be caused my a misbehaving driver monopolizing the server's resources.\n"); ("[mi] This may be caused my a misbehaving driver monopolizing the server's resources.\n");
miEventQueue.dropped = 0; miEventQueue.dropped = 0;

3
mi/mipointer.c
View File

@ -352,7 +352,6 @@ miPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
miPointerPtr pPointer; miPointerPtr pPointer;
BOOL changedScreen = FALSE; BOOL changedScreen = FALSE;
SetupScreen(pScreen);
pPointer = MIPOINTER(pDev); pPointer = MIPOINTER(pDev);
if (pPointer->pScreen != pScreen) { if (pPointer->pScreen != pScreen) {
@ -465,14 +464,12 @@ miPointerUpdateSprite(DeviceIntPtr pDev)
void void
miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y) miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y)
{ {
miPointerScreenPtr pScreenPriv;
ScreenPtr pScreen; ScreenPtr pScreen;
miPointerPtr pPointer; miPointerPtr pPointer;
pPointer = MIPOINTER(pDev); pPointer = MIPOINTER(pDev);
pScreen = screenInfo.screens[screen_no]; pScreen = screenInfo.screens[screen_no];
pScreenPriv = GetScreenPrivate(pScreen);
mieqSwitchScreen(pDev, pScreen, FALSE); mieqSwitchScreen(pDev, pScreen, FALSE);
NewCurrentScreen(pDev, pScreen, x, y); NewCurrentScreen(pDev, pScreen, x, y);