Ansify the XI 2 functions.

7 files changed, 33 insertions, 39 deletions

diff --git a/src/XChDevHier.c b/src/XChDevHier.c
index acc6431..4d5fc14 100644
--- a/src/XChDevHier.c
+++ b/src/XChDevHier.c
@@ -38,10 +38,9 @@ in this Software without prior written authorization from The Open Group.
 #include "XIint.h"
 
 int
-XChangeDeviceHierarchy(dpy, changes, num_changes)
-        Display* dpy;
-        XAnyHierarchyChangeInfo* changes;
-        int num_changes;
+XChangeDeviceHierarchy(Display* dpy,
+                       XAnyHierarchyChangeInfo* changes,
+                       int num_changes)
 {
     XAnyHierarchyChangeInfo* any;
     xChangeDeviceHierarchyReq *req;
diff --git a/src/XDefDevCur.c b/src/XDefDevCur.c
index 2a43946..fb7e8f7 100644
--- a/src/XDefDevCur.c
+++ b/src/XDefDevCur.c
@@ -37,11 +37,7 @@ in this Software without prior written authorization from The Open Group.
 #include "XIint.h"
 
 
-int XDefineDeviceCursor(dpy, dev, w, cursor)
-    register Display *dpy;
-    XDevice* dev;
-    Window w;
-    Cursor cursor;
+int XDefineDeviceCursor(Display *dpy, XDevice* dev, Window w, Cursor cursor)
 {
     register xChangeDeviceCursorReq *req;
 
diff --git a/src/XGetCPtr.c b/src/XGetCPtr.c
index 0944ee1..180d0c6 100644
--- a/src/XGetCPtr.c
+++ b/src/XGetCPtr.c
@@ -38,10 +38,7 @@ in this Software without prior written authorization from The Open Group.
 #include "XIint.h"
 
 Bool
-XGetClientPointer(dpy, win, deviceid)
-    Display* dpy;
-    Window win;
-    XID* deviceid;
+XGetClientPointer(Display* dpy, Window win, XID* deviceid)
 {
     xGetClientPointerReq *req;
     xGetClientPointerReply rep;
diff --git a/src/XQryAccRl.c b/src/XQryAccRl.c
index 0896b8a..20dddc7 100644
--- a/src/XQryAccRl.c
+++ b/src/XQryAccRl.c
@@ -38,13 +38,13 @@ in this Software without prior written authorization from The Open Group.
 #include "XIint.h"
 
 Status
-XQueryWindowAccess(Display* dpy, 
-             Window win, 
-             int* rule,
-             XID** permdevs, 
-             int* nperm, 
-             XID** denydevs,
-             int* ndeny)
+XQueryWindowAccess(Display*     dpy,
+                   Window       win,
+                   int*         rule,
+                   XID**        permdevs,
+                   int*         nperm,
+                   XID**        denydevs,
+                   int*         ndeny)
 {
     xQueryWindowAccessReq* req;
     xQueryWindowAccessReply rep;
diff --git a/src/XQueryDvPtr.c b/src/XQueryDvPtr.c
index 39026d0..878e93d 100644
--- a/src/XQueryDvPtr.c
+++ b/src/XQueryDvPtr.c
@@ -38,13 +38,16 @@ in this Software without prior written authorization from The Open Group.
 #include "XIint.h"
 
 Bool
-XQueryDevicePointer(dpy, dev, w, root, child, root_x, root_y, win_x, win_y,
-        mask )
-    register Display *dpy;
-    XDevice* dev;
-    Window w, *root, *child;
-    int *root_x, *root_y, *win_x, *win_y;
-    unsigned int *mask;
+XQueryDevicePointer(Display     *dpy,
+                    XDevice     *dev,
+                    Window      w,
+                    Window      *root,
+                    Window      *child,
+                    int         *root_x,
+                    int         *root_y,
+                    int         *win_x,
+                    int         *win_y,
+                    unsigned int *mask)
 {
     xQueryDevicePointerReq *req;
     xQueryDevicePointerReply rep;
diff --git a/src/XUndefDevCur.c b/src/XUndefDevCur.c
index 58a83a0..af20fff 100644
--- a/src/XUndefDevCur.c
+++ b/src/XUndefDevCur.c
@@ -37,10 +37,7 @@ in this Software without prior written authorization from The Open Group.
 #include "XIint.h"
 
 
-int XUndefDeviceCursor(dpy, dev, w)
-    register Display *dpy;
-    XDevice* dev;
-    Window w;
+int XUndefDeviceCursor(Display *dpy, XDevice* dev, Window w)
 {
     return XDefineDeviceCursor(dpy, dev, w, None);
 }
diff --git a/src/XWarpDvPtr.c b/src/XWarpDvPtr.c
index f85f218..b006be9 100644
--- a/src/XWarpDvPtr.c
+++ b/src/XWarpDvPtr.c
@@ -38,14 +38,16 @@ in this Software without prior written authorization from The Open Group.
 #include "XIint.h"
 
 int
-XWarpDevicePointer(dpy, dev, src_win, dst_win, src_x, src_y, src_width,
-        src_height, dst_x, dst_y) 
-    register Display *dpy;
-    XDevice* dev;
-    Window src_win, dst_win;
-    int src_x, src_y;
-    unsigned int src_width, src_height;
-    int dst_x, dst_y;
+XWarpDevicePointer(Display      *dpy,
+                   XDevice      *dev,
+                   Window       src_win,
+                   Window       dst_win,
+                   int          src_x,
+                   int          src_y,
+                   unsigned int src_width,
+                   unsigned int src_height,
+                   int          dst_x,
+                   int          dst_y)
 {
     register xWarpDevicePointerReq *req;