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

kdrive: adjust BlockHandler/WakeupHandler to new API 

Missing API update caused Xephyr to crash on startup, garbage memory
dereference when accessing timeout.
Introduced in 1f0e8bd5eb

kdrive.c:868:27: warning: assignment from incompatible pointer type
kdrive.c:869:28: warning: assignment from incompatible pointer type

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Peter Hutterer 2012-06-21 13:45:06 +10:00 committed by Keith Packard
parent 3f97284b10
commit a0c8716cdc
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/kdrive/src/kdrive.h
View File

@ -537,13 +537,11 @@ void
void void
KdBlockHandler(ScreenPtr pScreen, KdBlockHandler(ScreenPtr pScreen, pointer timeout, pointer readmask);
pointer blockData, pointer timeout, pointer readmask);
void void
KdWakeupHandler(ScreenPtr pScreen, KdWakeupHandler(ScreenPtr pScreen, unsigned long result, pointer readmask);
pointer data, unsigned long result, pointer readmask);
void void
KdDisableInput(void); KdDisableInput(void);

5
hw/kdrive/src/kinput.c
View File

@ -1972,7 +1972,7 @@ _KdEnqueuePointerEvent(KdPointerInfo * pi, int type, int x, int y, int z,
} }
void void
KdBlockHandler(ScreenPtr pScreen, pointer blockData, pointer timeout, pointer readmask) KdBlockHandler(ScreenPtr pScreen, pointer timeout, pointer readmask)
{ {
KdPointerInfo *pi; KdPointerInfo *pi;
int myTimeout = 0; int myTimeout = 0;
@ -1998,8 +1998,7 @@ KdBlockHandler(ScreenPtr pScreen, pointer blockData, pointer timeout, pointer re
} }
void void
KdWakeupHandler(ScreenPtr pScreen, KdWakeupHandler(ScreenPtr pScreen, unsigned long lresult, pointer readmask)
pointer data, unsigned long lresult, pointer readmask)
{ {
int result = (int) lresult; int result = (int) lresult;
fd_set *pReadmask = (fd_set *) readmask; fd_set *pReadmask = (fd_set *) readmask;