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

kdrive: numerous warning fixes

This commit is contained in:
Daniel Stone 2006-10-23 06:08:27 +03:00 committed by Daniel Stone
parent c8f76fb3a4
commit a7c2d9a15d
4 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/kdrive/src/kdrive.c
View File

@ -619,8 +619,6 @@ KdProcessArgument (int argc, char **argv, int i)
{ {
KdCardInfo *card; KdCardInfo *card;
KdScreenInfo *screen; KdScreenInfo *screen;
KdPointerInfo *pi;
KdKeyboardInfo *ki;
if (!strcmp (argv[i], "-card")) if (!strcmp (argv[i], "-card"))
{ {

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

@ -815,6 +815,9 @@ KdRegisterFd (int fd, void (*read) (int fd, void *closure), void *closure);
void void
KdUnregisterFds (void *closure, Bool do_close); KdUnregisterFds (void *closure, Bool do_close);
void
KdUnregisterFd (void *closure, int fd, Bool do_close);
void void
KdEnqueueKeyboardEvent(KdKeyboardInfo *ki, unsigned char scan_code, KdEnqueueKeyboardEvent(KdKeyboardInfo *ki, unsigned char scan_code,
unsigned char is_up); unsigned char is_up);

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

@ -48,6 +48,7 @@
#ifdef XINPUT #ifdef XINPUT
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.h>
#include "XIstubs.h" /* even though we don't use stubs. cute, no? */
#include "exevents.h" #include "exevents.h"
#include "extinit.h" #include "extinit.h"
#include "exglobals.h" #include "exglobals.h"
@ -131,7 +132,7 @@ KdUnblockSigio (void)
sigprocmask (SIG_UNBLOCK, &set, 0); sigprocmask (SIG_UNBLOCK, &set, 0);
} }
#ifdef DEBUG #ifdef DEBUG_SIGIO
void void
KdAssertSigioBlocked (char *where) KdAssertSigioBlocked (char *where)
@ -244,7 +245,7 @@ KdUnregisterFd (void *closure, int fd, Bool do_close)
for (i = 0; i < kdNumInputFds; i++) { for (i = 0; i < kdNumInputFds; i++) {
if (kdInputFds[i].closure == closure && if (kdInputFds[i].closure == closure &&
kdInputFds[i].fd == fd) { (fd == -1 || kdInputFds[i].fd == fd)) {
if (kdInputEnabled) if (kdInputEnabled)
KdRemoveFd (kdInputFds[i].fd); KdRemoveFd (kdInputFds[i].fd);
if (do_close) if (do_close)
@ -257,6 +258,12 @@ KdUnregisterFd (void *closure, int fd, Bool do_close)
} }
} }
void
KdUnregisterFds (void *closure, Bool do_close)
{
KdUnregisterFd(closure, -1, do_close);
}
void void
KdDisableInput (void) KdDisableInput (void)
{ {
@ -348,7 +355,7 @@ KdEnableInput (void)
KdUnblockSigio (); KdUnblockSigio ();
} }
KdKeyboardDriver * static KdKeyboardDriver *
KdFindKeyboardDriver (char *name) KdFindKeyboardDriver (char *name)
{ {
KdKeyboardDriver *ret; KdKeyboardDriver *ret;
@ -365,7 +372,7 @@ KdFindKeyboardDriver (char *name)
return NULL; return NULL;
} }
KdPointerDriver * static KdPointerDriver *
KdFindPointerDriver (char *name) KdFindPointerDriver (char *name)
{ {
KdPointerDriver *ret; KdPointerDriver *ret;
@ -444,7 +451,7 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
#ifdef XINPUT #ifdef XINPUT
if (pi->inputClass == KD_TOUCHSCREEN) { if (pi->inputClass == KD_TOUCHSCREEN) {
InitAbsoluteClassDeviceStruct(pDev); InitAbsoluteClassDeviceStruct(pDevice);
xiclass = AtomFromName(XI_TOUCHSCREEN); xiclass = AtomFromName(XI_TOUCHSCREEN);
} }
else { else {
@ -2261,7 +2268,8 @@ ChangeKeyboardDevice(DeviceIntPtr pOldDev, DeviceIntPtr pDev)
} }
int int
ChangePointerDevice(DeviceIntPtr pOldDev, DeviceIntPtr pDev, int x, int y) ChangePointerDevice(DeviceIntPtr pOldDev, DeviceIntPtr pDev, unsigned char x,
unsigned char y)
{ {
return BadDevice; return BadDevice;
} }
@ -2277,20 +2285,17 @@ OpenInputDevice(DeviceIntPtr pDev, ClientPtr client, int *status)
*status = Success; *status = Success;
} }
int void
CloseInputDevice(DeviceIntPtr pDev, ClientPtr client) CloseInputDevice(DeviceIntPtr pDev, ClientPtr client)
{ {
if (!pDev) return;
return BadDevice;
return Success;
} }
/* We initialise all input devices at startup. */ /* We initialise all input devices at startup. */
int void
AddOtherInputDevices(void) AddOtherInputDevices(void)
{ {
return Success; return;
} }
/* At the moment, absolute/relative is up to the client. */ /* At the moment, absolute/relative is up to the client. */
@ -2396,4 +2401,6 @@ NewInputDeviceRequest(InputOption *options)
return BadImplementation; return BadImplementation;
} }
} }
return Success;
} }

6
include/kdrive-config.h.in
View File

@ -25,4 +25,10 @@
/* Verbose debugging output hilarity */ /* Verbose debugging output hilarity */
#undef DEBUG #undef DEBUG
/* Have the backtrace() function. */
#undef HAVE_BACKTRACE
/* Have execinfo.h for backtrace(). */
#undef HAVE_EXECINFO_H
#endif /* _KDRIVE_CONFIG_H_ */ #endif /* _KDRIVE_CONFIG_H_ */