Bug #1434: Convert lib/Xext to ANSI function prototypes (Jeff Muizelaar).

1 files changed, 40 insertions, 51 deletions

diff --git a/src/XShm.c b/src/XShm.c
index 75679fa..cddb3db 100644
--- a/src/XShm.c
+++ b/src/XShm.c
@@ -142,9 +142,7 @@ event_to_wire (Display *dpy, XEvent *re, xEvent *event)
  *                                                                           *
  *****************************************************************************/
 
-Bool XShmQueryExtension (dpy /* event_basep, error_basep */)
-    Display *dpy;
-/*  int *event_basep, *error_basep; */
+Bool XShmQueryExtension (Display *dpy /*  int *event_basep, *error_basep */)
 {
     XExtDisplayInfo *info = find_display (dpy);
 
@@ -158,8 +156,7 @@ Bool XShmQueryExtension (dpy /* event_basep, error_basep */)
 }
 
 
-int XShmGetEventBase(dpy)
-    Display *dpy;
+int XShmGetEventBase(Display *dpy)
 {
     XExtDisplayInfo *info = find_display (dpy);
 
@@ -171,10 +168,11 @@ int XShmGetEventBase(dpy)
 }
 
 
-Bool XShmQueryVersion(dpy, majorVersion, minorVersion, sharedPixmaps)
-    Display *dpy;
-    int	    *majorVersion, *minorVersion;
-    Bool    *sharedPixmaps;
+Bool XShmQueryVersion(
+    Display *dpy,
+    int *majorVersion,
+    int *minorVersion,
+    Bool *sharedPixmaps)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xShmQueryVersionReply rep;
@@ -200,8 +198,7 @@ Bool XShmQueryVersion(dpy, majorVersion, minorVersion, sharedPixmaps)
 }
 
 
-int XShmPixmapFormat(dpy)
-    Display *dpy;
+int XShmPixmapFormat(Display *dpy)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xShmQueryVersionReply rep;
@@ -227,9 +224,7 @@ int XShmPixmapFormat(dpy)
 }
 
 
-Status XShmAttach(dpy, shminfo)
-    Display *dpy;
-    XShmSegmentInfo *shminfo;
+Status XShmAttach(Display *dpy, XShmSegmentInfo *shminfo)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xShmAttachReq *req;
@@ -250,9 +245,7 @@ Status XShmAttach(dpy, shminfo)
 }
 
 
-Status XShmDetach(dpy, shminfo)
-    Display *dpy;
-    XShmSegmentInfo *shminfo;
+Status XShmDetach(Display *dpy, XShmSegmentInfo *shminfo)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xShmDetachReq *req;
@@ -269,9 +262,7 @@ Status XShmDetach(dpy, shminfo)
     return 1;
 }
 
-static int _XShmDestroyImage (ximage)
-    XImage *ximage;
-
+static int _XShmDestroyImage (XImage *ximage)
 {
 	Xfree((char *)ximage);
 	return 1;
@@ -279,16 +270,15 @@ static int _XShmDestroyImage (ximage)
 
 #define ROUNDUP(nbytes, pad) ((((nbytes) + ((pad) - 1)) / (pad)) * (pad))
 
-XImage *XShmCreateImage (dpy, visual, depth, format, data, shminfo,
-			 width, height)
-    register Display *dpy;
-    register Visual *visual;
-    unsigned int depth;
-    int format;
-    char *data;
-    XShmSegmentInfo *shminfo;
-    unsigned int width;
-    unsigned int height;
+XImage *XShmCreateImage (
+    register Display *dpy,
+    register Visual *visual,
+    unsigned int depth,
+    int format,
+    char *data,
+    XShmSegmentInfo *shminfo,
+    unsigned int width,
+    unsigned int height)
 {
     register XImage *image;
 
@@ -324,15 +314,14 @@ XImage *XShmCreateImage (dpy, visual, depth, format, data, shminfo,
     return image;
 }
 
-Status XShmPutImage (dpy, d, gc, image, src_x, src_y, dst_x, dst_y,
-		     src_width, src_height, send_event)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    register XImage *image;
-    int src_x, src_y, dst_x, dst_y;
-    unsigned int src_width, src_height;
-    Bool send_event;
+Status XShmPutImage (
+    register Display *dpy,
+    Drawable d,
+    GC gc,
+    register XImage *image,
+    int src_x, int src_y, int dst_x, int dst_y,
+    unsigned int src_width, unsigned int src_height,
+    Bool send_event)
 {
     XExtDisplayInfo *info = find_display (dpy);
     XShmSegmentInfo *shminfo = (XShmSegmentInfo *)image->obdata;
@@ -367,12 +356,12 @@ Status XShmPutImage (dpy, d, gc, image, src_x, src_y, dst_x, dst_y,
 }
 
 
-Status XShmGetImage(dpy, d, image, x, y, plane_mask)
-    register Display *dpy;
-    Drawable d;
-    XImage *image;
-    int x, y;
-    unsigned long plane_mask;
+Status XShmGetImage(
+    register Display *dpy,
+    Drawable d,
+    XImage *image,
+    int x, int y,
+    unsigned long plane_mask)
 {
     XExtDisplayInfo *info = find_display (dpy);
     XShmSegmentInfo *shminfo = (XShmSegmentInfo *)image->obdata;
@@ -414,12 +403,12 @@ Status XShmGetImage(dpy, d, image, x, y, plane_mask)
     return 1;
 }
 
-Pixmap XShmCreatePixmap (dpy, d, data, shminfo, width, height, depth)
-    register Display *dpy;
-    Drawable d;
-    char *data;
-    XShmSegmentInfo *shminfo;
-    unsigned int width, height, depth;
+Pixmap XShmCreatePixmap (
+    register Display *dpy,
+    Drawable d,
+    char *data,
+    XShmSegmentInfo *shminfo,
+    unsigned int width, unsigned int height, unsigned int depth)
 {
     XExtDisplayInfo *info = find_display (dpy);
     Pixmap pid;