ANSIfy Xi/. Mostly automated via protoize(1).

1 files changed, 19 insertions, 48 deletions

diff --git a/Xi/listdev.c b/Xi/listdev.c
index b7eed86b7..e8d47c1a4 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -80,9 +80,8 @@ SOFTWARE.
  */
 
 int
-SProcXListInputDevices(client)
-    register ClientPtr client;
-    {
+SProcXListInputDevices(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xListInputDevicesReq);
@@ -97,9 +96,8 @@ SProcXListInputDevices(client)
  */
 
 int
-ProcXListInputDevices (client)
-    register ClientPtr client;
-    {
+ProcXListInputDevices (register ClientPtr client)
+{
     xListInputDevicesReply	rep;
     int			numdevs;
     int 		namesize = 1;	/* need 1 extra byte for strcpy */
@@ -155,11 +153,8 @@ ProcXListInputDevices (client)
  */
 
 void
-SizeDeviceInfo (d, namesize, size)
-    DeviceIntPtr d;
-    int *namesize;
-    int *size;
-    {
+SizeDeviceInfo (DeviceIntPtr d, int *namesize, int *size)
+{
     int chunks;
 
     *namesize += 1;
@@ -184,14 +179,8 @@ SizeDeviceInfo (d, namesize, size)
  */
 
 void
-ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf)
-    ClientPtr client;
-    DeviceIntPtr d;
-    xDeviceInfoPtr dev;
-    char **devbuf;
-    char **classbuf;
-    char **namebuf;
-    {
+ListDeviceInfo (ClientPtr client, DeviceIntPtr d, xDeviceInfoPtr dev, char **devbuf, char **classbuf, char **namebuf)
+{
     CopyDeviceName (namebuf, d->name);
     CopySwapDevice (client, d, 0, devbuf);
     if (d->key != NULL)
@@ -221,10 +210,8 @@ ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf)
  */
 
 void
-CopyDeviceName (namebuf, name)
-    char **namebuf;
-    char *name;
-    {
+CopyDeviceName (char **namebuf, char *name)
+{
     char *nameptr = (char *) *namebuf;
 
     if (name)
@@ -247,12 +234,8 @@ CopyDeviceName (namebuf, name)
  */
 
 void
-CopySwapDevice (client, d, num_classes, buf)
-    register ClientPtr 	client;
-    DeviceIntPtr	d;
-    int			num_classes;
-    char 		**buf;
-    {
+CopySwapDevice (register ClientPtr client, DeviceIntPtr d, int num_classes, char **buf)
+{
     register char 	n;
     xDeviceInfoPtr dev;
 
@@ -281,11 +264,8 @@ CopySwapDevice (client, d, num_classes, buf)
  */
 
 void
-CopySwapKeyClass (client, k, buf)
-    register ClientPtr 	client;
-    KeyClassPtr 	k;
-    char 		**buf;
-    {
+CopySwapKeyClass (register ClientPtr client, KeyClassPtr k, char **buf)
+{
     register char 	n;
     xKeyInfoPtr 	k2;
 
@@ -309,11 +289,8 @@ CopySwapKeyClass (client, k, buf)
  */
 
 void
-CopySwapButtonClass (client, b, buf)
-    register ClientPtr 	client;
-    ButtonClassPtr 	b;
-    char 		**buf;
-    {
+CopySwapButtonClass (register ClientPtr client, ButtonClassPtr b, char **buf)
+{
     register char 	n;
     xButtonInfoPtr 	b2;
 
@@ -341,10 +318,7 @@ CopySwapButtonClass (client, b, buf)
  */
 
 int
-CopySwapValuatorClass (client, v, buf)
-    register ClientPtr 	client;
-    ValuatorClassPtr 	v;
-    char 		**buf;
+CopySwapValuatorClass (register ClientPtr client, ValuatorClassPtr v, char **buf)
 {
     int			i, j, axes, t_axes;
     register char 	n;
@@ -394,11 +368,8 @@ CopySwapValuatorClass (client, v, buf)
  */
 
 void
-SRepXListInputDevices (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xListInputDevicesReply	*rep;
-    {
+SRepXListInputDevices (ClientPtr client, int size, xListInputDevicesReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);