[xserver-commit] xserver/Xi allowev.c,3.6,3.7 chgdctl.c,3.6,3.7 chgfctl.c,3.6,3.7 chgkbd.c,3.8,3.9 chgkmap.c,3.5,3.6 chgprop.c,3.5,3.6 chgptr.c,3.9,3.10 closedev.c,3.6,3.7 devbell.c,3.5,3.6
Warren Turkal
xserver-commit@pdx.freedesktop.org
Committed by: wt
Update of /cvs/xserver/xserver/Xi
In directory pdx:/tmp/cvs-serv21631/Xi
Modified Files:
allowev.c chgdctl.c chgfctl.c chgkbd.c chgkmap.c chgprop.c
chgptr.c closedev.c devbell.c
Log Message:
more ansification
Index: allowev.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/allowev.c,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -d -r3.6 -r3.7
--- allowev.c 14 Feb 2004 05:20:47 -0000 3.6
+++ allowev.c 15 Feb 2004 15:16:29 -0000 3.7
@@ -78,8 +78,7 @@
*/
int
-SProcXAllowDeviceEvents(client)
- register ClientPtr client;
+SProcXAllowDeviceEvents(register ClientPtr client)
{
register char n;
@@ -97,8 +96,7 @@
*/
int
-ProcXAllowDeviceEvents(client)
- register ClientPtr client;
+ProcXAllowDeviceEvents(register ClientPtr client)
{
TimeStamp time;
DeviceIntPtr thisdev;
Index: chgdctl.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/chgdctl.c,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -d -r3.6 -r3.7
--- chgdctl.c 14 Feb 2004 05:20:47 -0000 3.6
+++ chgdctl.c 15 Feb 2004 15:16:29 -0000 3.7
@@ -79,8 +79,7 @@
*/
int
-SProcXChangeDeviceControl(client)
- register ClientPtr client;
+SProcXChangeDeviceControl(register ClientPtr client)
{
register char n;
@@ -98,8 +97,7 @@
*/
int
-ProcXChangeDeviceControl(client)
- ClientPtr client;
+ProcXChangeDeviceControl(ClientPtr client)
{
unsigned len;
int i, status;
@@ -204,10 +202,7 @@
*/
void
-SRepXChangeDeviceControl (client, size, rep)
- ClientPtr client;
- int size;
- xChangeDeviceControlReply *rep;
+SRepXChangeDeviceControl (ClientPtr client, int size, xChangeDeviceControlReply *rep)
{
register char n;
Index: chgfctl.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/chgfctl.c,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -d -r3.6 -r3.7
--- chgfctl.c 14 Feb 2004 05:20:47 -0000 3.6
+++ chgfctl.c 15 Feb 2004 15:16:29 -0000 3.7
@@ -80,8 +80,7 @@
*/
int
-SProcXChangeFeedbackControl(client)
- register ClientPtr client;
+SProcXChangeFeedbackControl(register ClientPtr client)
{
register char n;
@@ -99,8 +98,7 @@
*/
int
-ProcXChangeFeedbackControl(client)
- ClientPtr client;
+ProcXChangeFeedbackControl(ClientPtr client)
{
unsigned len;
DeviceIntPtr dev;
@@ -232,12 +230,8 @@
*/
int
-ChangeKbdFeedback (client, dev, mask, k, f)
- ClientPtr client;
- DeviceIntPtr dev;
- unsigned long mask;
- KbdFeedbackPtr k;
- xKbdFeedbackCtl *f;
+ChangeKbdFeedback (ClientPtr client, DeviceIntPtr dev, unsigned long mask,
+ KbdFeedbackPtr k, xKbdFeedbackCtl *f)
{
register char n;
KeybdCtrl kctrl;
@@ -388,12 +382,8 @@
*/
int
-ChangePtrFeedback (client, dev, mask, p, f)
- ClientPtr client;
- DeviceIntPtr dev;
- unsigned long mask;
- PtrFeedbackPtr p;
- xPtrFeedbackCtl *f;
+ChangePtrFeedback (ClientPtr client, DeviceIntPtr dev, unsigned long mask,
+ PtrFeedbackPtr p, xPtrFeedbackCtl *f)
{
register char n;
PtrCtrl pctrl; /* might get BadValue part way through */
@@ -470,12 +460,8 @@
*/
int
-ChangeIntegerFeedback (client, dev, mask, i, f)
- ClientPtr client;
- DeviceIntPtr dev;
- unsigned long mask;
- IntegerFeedbackPtr i;
- xIntegerFeedbackCtl *f;
+ChangeIntegerFeedback (ClientPtr client, DeviceIntPtr dev, unsigned long mask,
+ IntegerFeedbackPtr i, xIntegerFeedbackCtl *f)
{
register char n;
@@ -497,12 +483,8 @@
*/
int
-ChangeStringFeedback (client, dev, mask, s, f)
- ClientPtr client;
- DeviceIntPtr dev;
- unsigned long mask;
- StringFeedbackPtr s;
- xStringFeedbackCtl *f;
+ChangeStringFeedback (ClientPtr client, DeviceIntPtr dev, unsigned long mask,
+ StringFeedbackPtr s, xStringFeedbackCtl *f)
{
register char n;
register long *p;
@@ -555,12 +537,8 @@
*/
int
-ChangeBellFeedback (client, dev, mask, b, f)
- ClientPtr client;
- DeviceIntPtr dev;
- unsigned long mask;
- BellFeedbackPtr b;
- xBellFeedbackCtl *f;
+ChangeBellFeedback (ClientPtr client, DeviceIntPtr dev, unsigned long mask,
+ BellFeedbackPtr b, xBellFeedbackCtl *f)
{
register char n;
int t;
@@ -630,12 +608,8 @@
*/
int
-ChangeLedFeedback (client, dev, mask, l, f)
- ClientPtr client;
- DeviceIntPtr dev;
- unsigned long mask;
- LedFeedbackPtr l;
- xLedFeedbackCtl *f;
+ChangeLedFeedback (ClientPtr client, DeviceIntPtr dev, unsigned long mask,
+ LedFeedbackPtr l, xLedFeedbackCtl *f)
{
register char n;
LedCtrl lctrl; /* might get BadValue part way through */
Index: chgkbd.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/chgkbd.c,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -d -r3.8 -r3.9
--- chgkbd.c 14 Feb 2004 05:20:47 -0000 3.8
+++ chgkbd.c 15 Feb 2004 15:16:29 -0000 3.9
@@ -81,8 +81,7 @@
*/
int
-SProcXChangeKeyboardDevice(client)
- register ClientPtr client;
+SProcXChangeKeyboardDevice(register ClientPtr client)
{
register char n;
@@ -100,8 +99,7 @@
*/
int
-ProcXChangeKeyboardDevice (client)
- register ClientPtr client;
+ProcXChangeKeyboardDevice (register ClientPtr client)
{
int i;
DeviceIntPtr xkbd = inputInfo.keyboard;
@@ -202,10 +200,7 @@
*/
void
-SRepXChangeKeyboardDevice (client, size, rep)
- ClientPtr client;
- int size;
- xChangeKeyboardDeviceReply *rep;
+SRepXChangeKeyboardDevice (ClientPtr client, int size, xChangeKeyboardDeviceReply *rep)
{
register char n;
Index: chgkmap.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/chgkmap.c,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -d -r3.5 -r3.6
--- chgkmap.c 14 Feb 2004 05:20:47 -0000 3.5
+++ chgkmap.c 15 Feb 2004 15:16:29 -0000 3.6
@@ -45,7 +45,6 @@
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgkmap.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */
/********************************************************************
*
@@ -78,8 +77,7 @@
*/
int
-SProcXChangeDeviceKeyMapping(client)
- register ClientPtr client;
+SProcXChangeDeviceKeyMapping(register ClientPtr client)
{
register char n;
register long *p;
@@ -105,8 +103,7 @@
*/
int
-ProcXChangeDeviceKeyMapping(client)
- register ClientPtr client;
+ProcXChangeDeviceKeyMapping(register ClientPtr client)
{
int ret;
unsigned len;
Index: chgprop.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/chgprop.c,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -d -r3.5 -r3.6
--- chgprop.c 14 Feb 2004 05:20:47 -0000 3.5
+++ chgprop.c 15 Feb 2004 15:16:29 -0000 3.6
@@ -45,7 +45,6 @@
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgprop.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */
/***********************************************************************
*
@@ -80,8 +79,7 @@
*/
int
-SProcXChangeDeviceDontPropagateList(client)
- register ClientPtr client;
+SProcXChangeDeviceDontPropagateList(register ClientPtr client)
{
register char n;
register long *p;
@@ -108,8 +106,7 @@
*/
int
-ProcXChangeDeviceDontPropagateList (client)
- register ClientPtr client;
+ProcXChangeDeviceDontPropagateList (register ClientPtr client)
{
int i;
WindowPtr pWin;
Index: chgptr.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/chgptr.c,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -d -r3.9 -r3.10
--- chgptr.c 14 Feb 2004 05:20:47 -0000 3.9
+++ chgptr.c 15 Feb 2004 15:16:29 -0000 3.10
@@ -84,8 +84,7 @@
*/
int
-SProcXChangePointerDevice(client)
- register ClientPtr client;
+SProcXChangePointerDevice(register ClientPtr client)
{
register char n;
@@ -102,8 +101,7 @@
*/
int
-ProcXChangePointerDevice (client)
- register ClientPtr client;
+ProcXChangePointerDevice (register ClientPtr client)
{
DeviceIntPtr xptr = inputInfo.pointer;
DeviceIntPtr dev;
@@ -181,8 +179,7 @@
}
void
-DeleteFocusClassDeviceStruct(dev)
- DeviceIntPtr dev;
+DeleteFocusClassDeviceStruct(DeviceIntPtr dev)
{
xfree(dev->focus->trace);
xfree(dev->focus);
@@ -196,11 +193,7 @@
*/
void
-SendEventToAllWindows (dev, mask, ev, count)
- DeviceIntPtr dev;
- Mask mask;
- xEvent *ev;
- int count;
+SendEventToAllWindows (DeviceIntPtr dev, Mask mask, xEvent *ev, int count)
{
int i;
WindowPtr pWin, p1;
@@ -222,12 +215,8 @@
*/
void
-FindInterestedChildren (dev, p1, mask, ev, count)
- DeviceIntPtr dev;
- WindowPtr p1;
- Mask mask;
- xEvent *ev;
- int count;
+FindInterestedChildren (DeviceIntPtr dev, WindowPtr p1, Mask mask, xEvent *ev,
+ int count)
{
WindowPtr p2;
@@ -248,10 +237,7 @@
*/
void
-SRepXChangePointerDevice (client, size, rep)
- ClientPtr client;
- int size;
- xChangePointerDeviceReply *rep;
+SRepXChangePointerDevice (ClientPtr client, int size, xChangePointerDeviceReply *rep)
{
register char n;
Index: closedev.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/closedev.c,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -d -r3.6 -r3.7
--- closedev.c 14 Feb 2004 05:20:47 -0000 3.6
+++ closedev.c 15 Feb 2004 15:16:29 -0000 3.7
@@ -79,8 +79,7 @@
*/
int
-SProcXCloseDevice(client)
- register ClientPtr client;
+SProcXCloseDevice(register ClientPtr client)
{
register char n;
@@ -97,8 +96,7 @@
*/
int
-ProcXCloseDevice(client)
- register ClientPtr client;
+ProcXCloseDevice(register ClientPtr client)
{
int i;
WindowPtr pWin, p1;
@@ -141,10 +139,7 @@
*/
void
-DeleteEventsFromChildren(dev, p1, client)
- DeviceIntPtr dev;
- WindowPtr p1;
- ClientPtr client;
+DeleteEventsFromChildren(DeviceIntPtr dev, WindowPtr p1, ClientPtr client)
{
WindowPtr p2;
@@ -165,10 +160,7 @@
*/
void
-DeleteDeviceEvents (dev, pWin, client)
- DeviceIntPtr dev;
- WindowPtr pWin;
- ClientPtr client;
+DeleteDeviceEvents (DeviceIntPtr dev, WindowPtr pWin, ClientPtr client)
{
InputClientsPtr others;
OtherInputMasks *pOthers;
Index: devbell.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/devbell.c,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -d -r3.5 -r3.6
--- devbell.c 14 Feb 2004 05:20:47 -0000 3.5
+++ devbell.c 15 Feb 2004 15:16:29 -0000 3.6
@@ -77,8 +77,7 @@
*/
int
-SProcXDeviceBell(client)
- register ClientPtr client;
+SProcXDeviceBell(register ClientPtr client)
{
register char n;
@@ -94,15 +93,14 @@
*/
int
-ProcXDeviceBell (client)
- register ClientPtr client;
+ProcXDeviceBell (register ClientPtr client)
{
DeviceIntPtr dev;
KbdFeedbackPtr k;
BellFeedbackPtr b;
int base;
int newpercent;
- CARD8 class;
+ CARD8 _class; //named with _ to get it out of c++ keywords
pointer ctrl;
BellProcPtr proc;
@@ -137,7 +135,7 @@
base = k->ctrl.bell;
proc = k->BellProc;
ctrl = (pointer) &(k->ctrl);
- class = KbdFeedbackClass;
+ _class = KbdFeedbackClass;
}
else if (stuff->feedbackclass == BellFeedbackClass)
{
@@ -153,7 +151,7 @@
base = b->ctrl.percent;
proc = b->BellProc;
ctrl = (pointer) &(b->ctrl);
- class = BellFeedbackClass;
+ _class = BellFeedbackClass;
}
else
{
@@ -166,7 +164,7 @@
newpercent = base + newpercent;
else
newpercent = base - newpercent + stuff->percent;
- (*proc)(newpercent, dev, ctrl, class);
+ (*proc)(newpercent, dev, ctrl, _class);
return Success;
}