From 190346663b4e61d64082be5cb36ddee46973c95c Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 6 Aug 2024 15:21:48 +0200 Subject: [PATCH] Xi: drop now obsolete swap procs Lots of SProc's have become no-ops, just calling the actual Proc's, so we can get rid of them entirely. Signed-off-by: Enrico Weigelt, metux IT consult Part-of: --- Xi/chgkbd.c | 14 -------------- Xi/chgkbd.h | 3 --- Xi/chgptr.c | 13 ------------- Xi/chgptr.h | 3 --- Xi/closedev.c | 12 ------------ Xi/closedev.h | 3 --- Xi/devbell.c | 13 ------------- Xi/devbell.h | 3 --- Xi/extinit.c | 38 +++++++++++++++++++------------------- Xi/getbmap.c | 12 ------------ Xi/getbmap.h | 3 --- Xi/getfctl.c | 13 ------------- Xi/getfctl.h | 3 --- Xi/getfocus.c | 12 ------------ Xi/getfocus.h | 3 --- Xi/getkmap.c | 13 ------------- Xi/getkmap.h | 3 --- Xi/getmmap.c | 13 ------------- Xi/getmmap.h | 3 --- Xi/grabdev.c | 1 + Xi/listdev.c | 12 ------------ Xi/listdev.h | 3 --- Xi/opendev.c | 13 ------------- Xi/opendev.h | 3 --- Xi/queryst.c | 12 ------------ Xi/queryst.h | 3 --- Xi/setbmap.c | 12 ------------ Xi/setbmap.h | 3 --- Xi/setdval.c | 12 ------------ Xi/setdval.h | 3 --- Xi/setmmap.c | 13 ------------- Xi/setmmap.h | 3 --- Xi/setmode.c | 12 ------------ Xi/setmode.h | 3 --- Xi/xichangehierarchy.c | 6 ------ Xi/xichangehierarchy.h | 1 - Xi/xiproperty.c | 6 ------ Xi/xiproperty.h | 1 - 38 files changed, 20 insertions(+), 282 deletions(-) diff --git a/Xi/chgkbd.c b/Xi/chgkbd.c index a196b5046..8e16c9dea 100644 --- a/Xi/chgkbd.c +++ b/Xi/chgkbd.c @@ -69,20 +69,6 @@ SOFTWARE. * This procedure changes the keyboard device. * */ - -int _X_COLD -SProcXChangeKeyboardDevice(ClientPtr client) -{ - return (ProcXChangeKeyboardDevice(client)); -} - -/*********************************************************************** - * - * This procedure is invoked to swap the request bytes if the server and - * client have a different byte order. - * - */ - int ProcXChangeKeyboardDevice(ClientPtr client) { diff --git a/Xi/chgkbd.h b/Xi/chgkbd.h index ec567fe42..55ea3947a 100644 --- a/Xi/chgkbd.h +++ b/Xi/chgkbd.h @@ -30,9 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef CHGKBD_H #define CHGKBD_H 1 -int SProcXChangeKeyboardDevice(ClientPtr /* client */ - ); - int ProcXChangeKeyboardDevice(ClientPtr /* client */ ); diff --git a/Xi/chgptr.c b/Xi/chgptr.c index b6e4777b9..42d160bf3 100644 --- a/Xi/chgptr.c +++ b/Xi/chgptr.c @@ -65,19 +65,6 @@ SOFTWARE. #include "chgptr.h" -/*********************************************************************** - * - * This procedure is invoked to swap the request bytes if the server and - * client have a different byte order. - * - */ - -int _X_COLD -SProcXChangePointerDevice(ClientPtr client) -{ - return (ProcXChangePointerDevice(client)); -} - /*********************************************************************** * * This procedure changes the device used as the X pointer. diff --git a/Xi/chgptr.h b/Xi/chgptr.h index 275511ffc..3a85f0f03 100644 --- a/Xi/chgptr.h +++ b/Xi/chgptr.h @@ -30,9 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef CHGPTR_H #define CHGPTR_H 1 -int SProcXChangePointerDevice(ClientPtr /* client */ - ); - int ProcXChangePointerDevice(ClientPtr /* client */ ); diff --git a/Xi/closedev.c b/Xi/closedev.c index d7743f105..15099d054 100644 --- a/Xi/closedev.c +++ b/Xi/closedev.c @@ -62,18 +62,6 @@ SOFTWARE. #include "closedev.h" -/*********************************************************************** - * - * This procedure closes an input device. - * - */ - -int _X_COLD -SProcXCloseDevice(ClientPtr client) -{ - return (ProcXCloseDevice(client)); -} - /*********************************************************************** * * Clear out event selections and passive grabs from a window for the diff --git a/Xi/closedev.h b/Xi/closedev.h index 798c02379..201d14f0a 100644 --- a/Xi/closedev.h +++ b/Xi/closedev.h @@ -30,9 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef CLOSEDEV_H #define CLOSEDEV_H 1 -int SProcXCloseDevice(ClientPtr /* client */ - ); - int ProcXCloseDevice(ClientPtr /* client */ ); diff --git a/Xi/devbell.c b/Xi/devbell.c index 598780e65..76085c738 100644 --- a/Xi/devbell.c +++ b/Xi/devbell.c @@ -59,19 +59,6 @@ SOFTWARE. #include "devbell.h" -/*********************************************************************** - * - * This procedure is invoked to swap the request bytes if the server and - * client have a different byte order. - * - */ - -int _X_COLD -SProcXDeviceBell(ClientPtr client) -{ - return (ProcXDeviceBell(client)); -} - /*********************************************************************** * * This procedure rings a bell on an extension device. diff --git a/Xi/devbell.h b/Xi/devbell.h index 2d0b05aa3..c83a9d4b0 100644 --- a/Xi/devbell.h +++ b/Xi/devbell.h @@ -30,9 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef DEVBELL_H #define DEVBELL_H 1 -int SProcXDeviceBell(ClientPtr /* client */ - ); - int ProcXDeviceBell(ClientPtr /* client */ ); diff --git a/Xi/extinit.c b/Xi/extinit.c index 223722ad2..f6f21f30d 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -252,19 +252,19 @@ static int (*ProcIVector[]) (ClientPtr) = { /* For swapped clients */ static int (*SProcIVector[]) (ClientPtr) = { - NULL, /* 0 */ + NULL, /* 0 */ SProcXGetExtensionVersion, /* 1 */ - SProcXListInputDevices, /* 2 */ - SProcXOpenDevice, /* 3 */ - SProcXCloseDevice, /* 4 */ - SProcXSetDeviceMode, /* 5 */ + ProcXListInputDevices, /* 2 */ + ProcXOpenDevice, /* 3 */ + ProcXCloseDevice, /* 4 */ + ProcXSetDeviceMode, /* 5 */ SProcXSelectExtensionEvent, /* 6 */ SProcXGetSelectedExtensionEvents, /* 7 */ SProcXChangeDeviceDontPropagateList, /* 8 */ SProcXGetDeviceDontPropagateList, /* 9 */ SProcXGetDeviceMotionEvents, /* 10 */ - SProcXChangeKeyboardDevice, /* 11 */ - SProcXChangePointerDevice, /* 12 */ + ProcXChangeKeyboardDevice, /* 11 */ + ProcXChangePointerDevice, /* 12 */ SProcXGrabDevice, /* 13 */ SProcXUngrabDevice, /* 14 */ SProcXGrabDeviceKey, /* 15 */ @@ -272,30 +272,30 @@ static int (*SProcIVector[]) (ClientPtr) = { SProcXGrabDeviceButton, /* 17 */ SProcXUngrabDeviceButton, /* 18 */ SProcXAllowDeviceEvents, /* 19 */ - SProcXGetDeviceFocus, /* 20 */ + ProcXGetDeviceFocus, /* 20 */ SProcXSetDeviceFocus, /* 21 */ - SProcXGetFeedbackControl, /* 22 */ + ProcXGetFeedbackControl, /* 22 */ SProcXChangeFeedbackControl, /* 23 */ - SProcXGetDeviceKeyMapping, /* 24 */ + ProcXGetDeviceKeyMapping, /* 24 */ SProcXChangeDeviceKeyMapping, /* 25 */ - SProcXGetDeviceModifierMapping, /* 26 */ - SProcXSetDeviceModifierMapping, /* 27 */ - SProcXGetDeviceButtonMapping, /* 28 */ - SProcXSetDeviceButtonMapping, /* 29 */ - SProcXQueryDeviceState, /* 30 */ + ProcXGetDeviceModifierMapping, /* 26 */ + ProcXSetDeviceModifierMapping, /* 27 */ + ProcXGetDeviceButtonMapping, /* 28 */ + ProcXSetDeviceButtonMapping, /* 29 */ + ProcXQueryDeviceState, /* 30 */ SProcXSendExtensionEvent, /* 31 */ - SProcXDeviceBell, /* 32 */ - SProcXSetDeviceValuators, /* 33 */ + ProcXDeviceBell, /* 32 */ + ProcXSetDeviceValuators, /* 33 */ SProcXGetDeviceControl, /* 34 */ SProcXChangeDeviceControl, /* 35 */ - SProcXListDeviceProperties, /* 36 */ + ProcXListDeviceProperties, /* 36 */ SProcXChangeDeviceProperty, /* 37 */ SProcXDeleteDeviceProperty, /* 38 */ SProcXGetDeviceProperty, /* 39 */ SProcXIQueryPointer, /* 40 */ SProcXIWarpPointer, /* 41 */ SProcXIChangeCursor, /* 42 */ - SProcXIChangeHierarchy, /* 43 */ + ProcXIChangeHierarchy, /* 43 */ SProcXISetClientPointer, /* 44 */ SProcXIGetClientPointer, /* 45 */ SProcXISelectEvents, /* 46 */ diff --git a/Xi/getbmap.c b/Xi/getbmap.c index 8344ddbc1..623978fd5 100644 --- a/Xi/getbmap.c +++ b/Xi/getbmap.c @@ -59,18 +59,6 @@ SOFTWARE. #include "getbmap.h" -/*********************************************************************** - * - * This procedure gets the button mapping for the specified device. - * - */ - -int _X_COLD -SProcXGetDeviceButtonMapping(ClientPtr client) -{ - return (ProcXGetDeviceButtonMapping(client)); -} - /*********************************************************************** * * This procedure gets the button mapping for the specified device. diff --git a/Xi/getbmap.h b/Xi/getbmap.h index 8b107d026..a320c7421 100644 --- a/Xi/getbmap.h +++ b/Xi/getbmap.h @@ -30,9 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GETBMAP_H #define GETBMAP_H 1 -int SProcXGetDeviceButtonMapping(ClientPtr /* client */ - ); - int ProcXGetDeviceButtonMapping(ClientPtr /* client */ ); diff --git a/Xi/getfctl.c b/Xi/getfctl.c index b920de468..562cd5260 100644 --- a/Xi/getfctl.c +++ b/Xi/getfctl.c @@ -59,19 +59,6 @@ SOFTWARE. #include "getfctl.h" -/*********************************************************************** - * - * This procedure gets the control attributes for an extension device, - * for clients on machines with a different byte ordering than the server. - * - */ - -int _X_COLD -SProcXGetFeedbackControl(ClientPtr client) -{ - return (ProcXGetFeedbackControl(client)); -} - /*********************************************************************** * * This procedure copies KbdFeedbackClass data, swapping if necessary. diff --git a/Xi/getfctl.h b/Xi/getfctl.h index f0b240d4c..14944d28b 100644 --- a/Xi/getfctl.h +++ b/Xi/getfctl.h @@ -30,9 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GETFCTL_H #define GETFCTL_H 1 -int SProcXGetFeedbackControl(ClientPtr /* client */ - ); - int ProcXGetFeedbackControl(ClientPtr /* client */ ); diff --git a/Xi/getfocus.c b/Xi/getfocus.c index 41dda55b6..731896b7d 100644 --- a/Xi/getfocus.c +++ b/Xi/getfocus.c @@ -60,18 +60,6 @@ SOFTWARE. #include "getfocus.h" -/*********************************************************************** - * - * This procedure gets the focus for a device. - * - */ - -int _X_COLD -SProcXGetDeviceFocus(ClientPtr client) -{ - return (ProcXGetDeviceFocus(client)); -} - /*********************************************************************** * * This procedure gets the focus for a device. diff --git a/Xi/getfocus.h b/Xi/getfocus.h index 6e90ae77b..daaedfcbd 100644 --- a/Xi/getfocus.h +++ b/Xi/getfocus.h @@ -30,9 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GETFOCUS_H #define GETFOCUS_H 1 -int SProcXGetDeviceFocus(ClientPtr /* client */ - ); - int ProcXGetDeviceFocus(ClientPtr /* client */ ); diff --git a/Xi/getkmap.c b/Xi/getkmap.c index 6288e764a..5d9cba1d5 100644 --- a/Xi/getkmap.c +++ b/Xi/getkmap.c @@ -62,19 +62,6 @@ SOFTWARE. #include "getkmap.h" -/*********************************************************************** - * - * This procedure gets the key mapping for an extension device, - * for clients on machines with a different byte ordering than the server. - * - */ - -int _X_COLD -SProcXGetDeviceKeyMapping(ClientPtr client) -{ - return (ProcXGetDeviceKeyMapping(client)); -} - /*********************************************************************** * * Get the device key mapping. diff --git a/Xi/getkmap.h b/Xi/getkmap.h index 8f0ff8eec..f51e0e96d 100644 --- a/Xi/getkmap.h +++ b/Xi/getkmap.h @@ -30,9 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GETKMAP_H #define GETKMAP_H 1 -int SProcXGetDeviceKeyMapping(ClientPtr /* client */ - ); - int ProcXGetDeviceKeyMapping(ClientPtr /* client */ ); diff --git a/Xi/getmmap.c b/Xi/getmmap.c index c7242d361..4ff03a3bd 100644 --- a/Xi/getmmap.c +++ b/Xi/getmmap.c @@ -59,19 +59,6 @@ SOFTWARE. #include "getmmap.h" -/*********************************************************************** - * - * This procedure gets the modifier mapping for an extension device, - * for clients on machines with a different byte ordering than the server. - * - */ - -int _X_COLD -SProcXGetDeviceModifierMapping(ClientPtr client) -{ - return (ProcXGetDeviceModifierMapping(client)); -} - /*********************************************************************** * * Get the device Modifier mapping. diff --git a/Xi/getmmap.h b/Xi/getmmap.h index d0a76df43..7512188ec 100644 --- a/Xi/getmmap.h +++ b/Xi/getmmap.h @@ -30,9 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GETMMAP_H #define GETMMAP_H 1 -int SProcXGetDeviceModifierMapping(ClientPtr /* client */ - ); - int ProcXGetDeviceModifierMapping(ClientPtr /* client */ ); diff --git a/Xi/grabdev.c b/Xi/grabdev.c index ba18a716a..9bae237d1 100644 --- a/Xi/grabdev.c +++ b/Xi/grabdev.c @@ -77,6 +77,7 @@ SProcXGrabDevice(ClientPtr client) { REQUEST(xGrabDeviceReq); REQUEST_AT_LEAST_SIZE(xGrabDeviceReq); + swapl(&stuff->grabWindow); swapl(&stuff->time); swaps(&stuff->event_count); diff --git a/Xi/listdev.c b/Xi/listdev.c index a1d4a90e5..bf2f439a4 100644 --- a/Xi/listdev.c +++ b/Xi/listdev.c @@ -68,18 +68,6 @@ SOFTWARE. #include "xkbstr.h" #include "listdev.h" -/*********************************************************************** - * - * This procedure lists the input devices available to the server. - * - */ - -int _X_COLD -SProcXListInputDevices(ClientPtr client) -{ - return (ProcXListInputDevices(client)); -} - /*********************************************************************** * * This procedure calculates the size of the information to be returned diff --git a/Xi/listdev.h b/Xi/listdev.h index 39ea2389f..c8f91796d 100644 --- a/Xi/listdev.h +++ b/Xi/listdev.h @@ -32,9 +32,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #define VPC 20 /* Max # valuators per chunk */ -int SProcXListInputDevices(ClientPtr /* client */ - ); - int ProcXListInputDevices(ClientPtr /* client */ ); diff --git a/Xi/opendev.c b/Xi/opendev.c index 9d4e579fc..977a44115 100644 --- a/Xi/opendev.c +++ b/Xi/opendev.c @@ -64,19 +64,6 @@ SOFTWARE. extern CARD8 event_base[]; -/*********************************************************************** - * - * This procedure swaps the request if the server and client have different - * byte orderings. - * - */ - -int _X_COLD -SProcXOpenDevice(ClientPtr client) -{ - return (ProcXOpenDevice(client)); -} - /*********************************************************************** * * This procedure causes the server to open an input device. diff --git a/Xi/opendev.h b/Xi/opendev.h index e2d806197..641dd7862 100644 --- a/Xi/opendev.h +++ b/Xi/opendev.h @@ -30,9 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef OPENDEV_H #define OPENDEV_H 1 -int SProcXOpenDevice(ClientPtr /* client */ - ); - int ProcXOpenDevice(ClientPtr /* client */ ); diff --git a/Xi/queryst.c b/Xi/queryst.c index 6c665e698..ca386f5dc 100644 --- a/Xi/queryst.c +++ b/Xi/queryst.c @@ -47,18 +47,6 @@ from The Open Group. #include "xkbstr.h" #include "queryst.h" -/*********************************************************************** - * - * This procedure allows a client to query the state of a device. - * - */ - -int _X_COLD -SProcXQueryDeviceState(ClientPtr client) -{ - return (ProcXQueryDeviceState(client)); -} - /*********************************************************************** * * This procedure allows frozen events to be routed. diff --git a/Xi/queryst.h b/Xi/queryst.h index 5619ca59d..a271edf71 100644 --- a/Xi/queryst.h +++ b/Xi/queryst.h @@ -30,9 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef QUERYST_H #define QUERYST_H 1 -int SProcXQueryDeviceState(ClientPtr /* client */ - ); - int ProcXQueryDeviceState(ClientPtr /* client */ ); diff --git a/Xi/setbmap.c b/Xi/setbmap.c index 7af6e6f08..4afa655fa 100644 --- a/Xi/setbmap.c +++ b/Xi/setbmap.c @@ -62,18 +62,6 @@ SOFTWARE. #include "exglobals.h" #include "setbmap.h" -/*********************************************************************** - * - * This procedure changes the button mapping. - * - */ - -int _X_COLD -SProcXSetDeviceButtonMapping(ClientPtr client) -{ - return (ProcXSetDeviceButtonMapping(client)); -} - /*********************************************************************** * * This procedure lists the input devices available to the server. diff --git a/Xi/setbmap.h b/Xi/setbmap.h index 8d73f23b4..b402692ce 100644 --- a/Xi/setbmap.h +++ b/Xi/setbmap.h @@ -30,9 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef SETBMAP_H #define SETBMAP_H 1 -int SProcXSetDeviceButtonMapping(ClientPtr /* client */ - ); - int ProcXSetDeviceButtonMapping(ClientPtr /* client */ ); diff --git a/Xi/setdval.c b/Xi/setdval.c index 3f8b3675e..2127e6afe 100644 --- a/Xi/setdval.c +++ b/Xi/setdval.c @@ -62,18 +62,6 @@ SOFTWARE. #include "exglobals.h" #include "setdval.h" -/*********************************************************************** - * - * Handle a request from a client with a different byte order. - * - */ - -int _X_COLD -SProcXSetDeviceValuators(ClientPtr client) -{ - return (ProcXSetDeviceValuators(client)); -} - /*********************************************************************** * * This procedure sets the value of valuators on an extension input device. diff --git a/Xi/setdval.h b/Xi/setdval.h index 05642743a..452be2897 100644 --- a/Xi/setdval.h +++ b/Xi/setdval.h @@ -30,9 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef SETDVAL_H #define SETDVAL_H 1 -int SProcXSetDeviceValuators(ClientPtr /* client */ - ); - int ProcXSetDeviceValuators(ClientPtr /* client */ ); diff --git a/Xi/setmmap.c b/Xi/setmmap.c index 4c1ce2c5e..1c8df53c2 100644 --- a/Xi/setmmap.c +++ b/Xi/setmmap.c @@ -63,19 +63,6 @@ SOFTWARE. #include "exglobals.h" #include "setmmap.h" -/*********************************************************************** - * - * This procedure sets the modifier mapping for an extension device, - * for clients on machines with a different byte ordering than the server. - * - */ - -int _X_COLD -SProcXSetDeviceModifierMapping(ClientPtr client) -{ - return (ProcXSetDeviceModifierMapping(client)); -} - /*********************************************************************** * * Set the device Modifier mapping. diff --git a/Xi/setmmap.h b/Xi/setmmap.h index 9347b9679..f8b96a875 100644 --- a/Xi/setmmap.h +++ b/Xi/setmmap.h @@ -30,9 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef SETMMAP_H #define SETMMAP_H 1 -int SProcXSetDeviceModifierMapping(ClientPtr /* client */ - ); - int ProcXSetDeviceModifierMapping(ClientPtr /* client */ ); diff --git a/Xi/setmode.c b/Xi/setmode.c index bae3838b0..9c9476134 100644 --- a/Xi/setmode.c +++ b/Xi/setmode.c @@ -62,18 +62,6 @@ SOFTWARE. #include "exglobals.h" #include "setmode.h" -/*********************************************************************** - * - * Handle a request from a client with a different byte order. - * - */ - -int _X_COLD -SProcXSetDeviceMode(ClientPtr client) -{ - return (ProcXSetDeviceMode(client)); -} - /*********************************************************************** * * This procedure sets the mode of a device. diff --git a/Xi/setmode.h b/Xi/setmode.h index d01bfffd3..cc906c735 100644 --- a/Xi/setmode.h +++ b/Xi/setmode.h @@ -30,9 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef SETMODE_H #define SETMODE_H 1 -int SProcXSetDeviceMode(ClientPtr /* client */ - ); - int ProcXSetDeviceMode(ClientPtr /* client */ ); diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c index 709c8f12a..a6e3171ee 100644 --- a/Xi/xichangehierarchy.c +++ b/Xi/xichangehierarchy.c @@ -128,12 +128,6 @@ XISendDeviceHierarchyEvent(int flags[MAXDEVICES]) * */ -int _X_COLD -SProcXIChangeHierarchy(ClientPtr client) -{ - return (ProcXIChangeHierarchy(client)); -} - static int add_master(ClientPtr client, xXIAddMasterInfo * c, int flags[MAXDEVICES]) { diff --git a/Xi/xichangehierarchy.h b/Xi/xichangehierarchy.h index 649b654e5..8fa3a66e7 100644 --- a/Xi/xichangehierarchy.h +++ b/Xi/xichangehierarchy.h @@ -36,7 +36,6 @@ #ifndef CHDEVHIER_H #define CHDEVHIER_H 1 -int SProcXIChangeHierarchy(ClientPtr /* client */ ); int ProcXIChangeHierarchy(ClientPtr /* client */ ); void XISendDeviceHierarchyEvent(int flags[MAXDEVICES]); diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c index 903f82a5e..8db6b03d1 100644 --- a/Xi/xiproperty.c +++ b/Xi/xiproperty.c @@ -1013,12 +1013,6 @@ ProcXGetDeviceProperty(ClientPtr client) return Success; } -int _X_COLD -SProcXListDeviceProperties(ClientPtr client) -{ - return (ProcXListDeviceProperties(client)); -} - int _X_COLD SProcXChangeDeviceProperty(ClientPtr client) { diff --git a/Xi/xiproperty.h b/Xi/xiproperty.h index 482c834ed..561779f2e 100644 --- a/Xi/xiproperty.h +++ b/Xi/xiproperty.h @@ -36,7 +36,6 @@ int ProcXDeleteDeviceProperty(ClientPtr client); int ProcXGetDeviceProperty(ClientPtr client); /* request swapping */ -int SProcXListDeviceProperties(ClientPtr client); int SProcXChangeDeviceProperty(ClientPtr client); int SProcXDeleteDeviceProperty(ClientPtr client); int SProcXGetDeviceProperty(ClientPtr client);