xc/programs/Xserver/dix/atom.c

xc/programs/Xserver/dix/colormap.c
xc/programs/Xserver/dix/cursor.c
xc/programs/Xserver/dix/devices.c
xc/programs/Xserver/dix/dispatch.c
xc/programs/Xserver/dix/dixfonts.c
xc/programs/Xserver/dix/dixutils.c
xc/programs/Xserver/dix/events.c
xc/programs/Xserver/dix/extension.c
xc/programs/Xserver/dix/gc.c
xc/programs/Xserver/dix/glyphcurs.c
xc/programs/Xserver/dix/grabs.c
xc/programs/Xserver/dix/main.c
xc/programs/Xserver/dix/pixmap.c
xc/programs/Xserver/dix/privates.c
xc/programs/Xserver/dix/property.c
xc/programs/Xserver/dix/resource.c
xc/programs/Xserver/dix/swaprep.c
xc/programs/Xserver/dix/swapreq.c
//bugs.freedesktop.org/show_bug.cgi?id=2560) attachment #2037
    (https://bugs.freedesktop.org/attachment.cgi?id=2037) ANSI-fy
    Xserver/dix code. The conversion preserves the comments which annotate
    variables. These have been moved into doxygen(esque?) "stubs" above
    each function. Patch by Mike Owens <etc@filespanker.com>.

1 files changed, 110 insertions, 224 deletions

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 69debb5e8..2f24e6126 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.4 2004/07/29 18:43:58 stukreit Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.6 2004/09/15 09:05:22 eich Exp $ */
 /* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
 /************************************************************
 
@@ -144,13 +144,9 @@ CallbackListPtr ServerGrabCallback = NULL;
 HWEventQueuePtr checkForInput[2];
 extern int connBlockScreenStart;
 
-static void KillAllClients(
-    void
-);
+static void KillAllClients(void);
 
-static void DeleteClientFromAnySelections(
-    ClientPtr /*client*/
-);
+static void DeleteClientFromAnySelections(ClientPtr client);
 
 static int nextFreeClientID; /* always MIN free client ID */
 
@@ -171,8 +167,7 @@ XID clientErrorValue;   /* XXX this is a kludge */
     (a.pScreen == b.pScreen))
 
 void
-SetInputCheck(c0, c1)
-    HWEventQueuePtr c0, c1;
+SetInputCheck(HWEventQueuePtr c0, HWEventQueuePtr c1)
 {
     checkForInput[0] = c0;
     checkForInput[1] = c1;
@@ -220,8 +215,7 @@ InitSelections()
 }
 
 void 
-FlushClientCaches(id)
-    XID id;
+FlushClientCaches(XID id)
 {
     int i;
     register ClientPtr client;
@@ -488,17 +482,14 @@ Dispatch(void)
 
 #undef MAJOROP
 
-/*ARGSUSED*/
 int
-ProcBadRequest(client)
-    ClientPtr client;
+ProcBadRequest(ClientPtr client)
 {
     return (BadRequest);
 }
 
 int
-ProcCreateWindow(client)
-    register ClientPtr client;
+ProcCreateWindow(ClientPtr client)
 {
     register WindowPtr pParent, pWin;
     REQUEST(xCreateWindowReq);
@@ -541,8 +532,7 @@ ProcCreateWindow(client)
 }
 
 int
-ProcChangeWindowAttributes(client)
-    register ClientPtr client;
+ProcChangeWindowAttributes(register ClientPtr client)
 {
     register WindowPtr pWin;
     REQUEST(xChangeWindowAttributesReq);
@@ -568,8 +558,7 @@ ProcChangeWindowAttributes(client)
 }
 
 int
-ProcGetWindowAttributes(client)
-    register ClientPtr client;
+ProcGetWindowAttributes(register ClientPtr client)
 {
     register WindowPtr pWin;
     REQUEST(xResourceReq);
@@ -586,8 +575,7 @@ ProcGetWindowAttributes(client)
 }
 
 int
-ProcDestroyWindow(client)
-    register ClientPtr client;
+ProcDestroyWindow(register ClientPtr client)
 {
     register WindowPtr pWin;
     REQUEST(xResourceReq);
@@ -603,8 +591,7 @@ ProcDestroyWindow(client)
 }
 
 int
-ProcDestroySubwindows(client)
-    register ClientPtr client;
+ProcDestroySubwindows(register ClientPtr client)
 {
     register WindowPtr pWin;
     REQUEST(xResourceReq);
@@ -619,8 +606,7 @@ ProcDestroySubwindows(client)
 }
 
 int
-ProcChangeSaveSet(client)
-    register ClientPtr client;
+ProcChangeSaveSet(register ClientPtr client)
 {
     register WindowPtr pWin;
     REQUEST(xChangeSaveSetReq);
@@ -649,8 +635,7 @@ ProcChangeSaveSet(client)
 }
 
 int
-ProcReparentWindow(client)
-    register ClientPtr client;
+ProcReparentWindow(register ClientPtr client)
 {
     register WindowPtr pWin, pParent;
     REQUEST(xReparentWindowReq);
@@ -685,8 +670,7 @@ ProcReparentWindow(client)
 }
 
 int
-ProcMapWindow(client)
-    register ClientPtr client;
+ProcMapWindow(register ClientPtr client)
 {
     register WindowPtr pWin;
     REQUEST(xResourceReq);
@@ -702,8 +686,7 @@ ProcMapWindow(client)
 }
 
 int
-ProcMapSubwindows(client)
-    register ClientPtr client;
+ProcMapSubwindows(register ClientPtr client)
 {
     register WindowPtr pWin;
     REQUEST(xResourceReq);
@@ -719,8 +702,7 @@ ProcMapSubwindows(client)
 }
 
 int
-ProcUnmapWindow(client)
-    register ClientPtr client;
+ProcUnmapWindow(register ClientPtr client)
 {
     register WindowPtr pWin;
     REQUEST(xResourceReq);
@@ -736,8 +718,7 @@ ProcUnmapWindow(client)
 }
 
 int
-ProcUnmapSubwindows(client)
-    register ClientPtr client;
+ProcUnmapSubwindows(register ClientPtr client)
 {
     register WindowPtr pWin;
     REQUEST(xResourceReq);
@@ -752,8 +733,7 @@ ProcUnmapSubwindows(client)
 }
 
 int
-ProcConfigureWindow(client)
-    register ClientPtr client;
+ProcConfigureWindow(register ClientPtr client)
 {
     register WindowPtr pWin;
     REQUEST(xConfigureWindowReq);
@@ -777,8 +757,7 @@ ProcConfigureWindow(client)
 }
 
 int
-ProcCirculateWindow(client)
-    register ClientPtr client;
+ProcCirculateWindow(register ClientPtr client)
 {
     register WindowPtr pWin;
     REQUEST(xCirculateWindowReq);
@@ -799,9 +778,7 @@ ProcCirculateWindow(client)
 }
 
 int
-GetGeometry(client, rep)
-    register ClientPtr client;
-    xGetGeometryReply *rep;
+GetGeometry(register ClientPtr client, xGetGeometryReply *rep)
 {
     register DrawablePtr pDraw;
     REQUEST(xResourceReq);
@@ -842,8 +819,7 @@ GetGeometry(client, rep)
 
 
 int
-ProcGetGeometry(client)
-    register ClientPtr client;
+ProcGetGeometry(register ClientPtr client)
 {
     xGetGeometryReply rep;
     int status;
@@ -857,8 +833,7 @@ ProcGetGeometry(client)
 
 
 int
-ProcQueryTree(client)
-    register ClientPtr client;
+ProcQueryTree(register ClientPtr client)
 {
     xQueryTreeReply reply;
     int numChildren = 0;
@@ -907,8 +882,7 @@ ProcQueryTree(client)
 }
 
 int
-ProcInternAtom(client)
-    register ClientPtr client;
+ProcInternAtom(register ClientPtr client)
 {
     Atom atom;
     char *tchar;
@@ -937,8 +911,7 @@ ProcInternAtom(client)
 }
 
 int
-ProcGetAtomName(client)
-    register ClientPtr client;
+ProcGetAtomName(register ClientPtr client)
 {
     char *str;
     xGetAtomNameReply reply;
@@ -969,8 +942,7 @@ extern int k5_bad();
 #endif
 
 int
-ProcSetSelectionOwner(client)
-    register ClientPtr client;
+ProcSetSelectionOwner(register ClientPtr client)
 {
     WindowPtr pWin;
     TimeStamp time;
@@ -1066,8 +1038,7 @@ ProcSetSelectionOwner(client)
 }
 
 int
-ProcGetSelectionOwner(client)
-    register ClientPtr client;
+ProcGetSelectionOwner(register ClientPtr client)
 {
     REQUEST(xResourceReq);
 
@@ -1098,8 +1069,7 @@ ProcGetSelectionOwner(client)
 }
 
 int
-ProcConvertSelection(client)
-    register ClientPtr client;
+ProcConvertSelection(register ClientPtr client)
 {
     Bool paramsOkay;
     xEvent event;
@@ -1163,8 +1133,7 @@ ProcConvertSelection(client)
 }
 
 int
-ProcGrabServer(client)
-    register ClientPtr client;
+ProcGrabServer(register ClientPtr client)
 {
     REQUEST_SIZE_MATCH(xReq);
     if (grabState != GrabNone && client != grabClient)
@@ -1218,8 +1187,7 @@ UngrabServer(ClientPtr client)
 }
 
 int
-ProcUngrabServer(client)
-    register ClientPtr client;
+ProcUngrabServer(register ClientPtr client)
 {
     REQUEST_SIZE_MATCH(xReq);
     UngrabServer(client);
@@ -1227,8 +1195,7 @@ ProcUngrabServer(client)
 }
 
 int
-ProcTranslateCoords(client)
-    register ClientPtr client;
+ProcTranslateCoords(register ClientPtr client)
 {
     REQUEST(xTranslateCoordsReq);
 
@@ -1300,8 +1267,7 @@ ProcTranslateCoords(client)
 }
 
 int
-ProcOpenFont(client)
-    register ClientPtr client;
+ProcOpenFont(register ClientPtr client)
 {
     int	err;
     REQUEST(xOpenFontReq);
@@ -1320,8 +1286,7 @@ ProcOpenFont(client)
 }
 
 int
-ProcCloseFont(client)
-    register ClientPtr client;
+ProcCloseFont(register ClientPtr client)
 {
     FontPtr pFont;
     REQUEST(xResourceReq);
@@ -1342,8 +1307,7 @@ ProcCloseFont(client)
 }
 
 int
-ProcQueryFont(client)
-    register ClientPtr client;
+ProcQueryFont(register ClientPtr client)
 {
     xQueryFontReply	*reply;
     FontPtr pFont;
@@ -1402,8 +1366,7 @@ ProcQueryFont(client)
 }
 
 int
-ProcQueryTextExtents(client)
-    register ClientPtr client;
+ProcQueryTextExtents(register ClientPtr client)
 {
     REQUEST(xQueryTextExtentsReq);
     xQueryTextExtentsReply reply;
@@ -1453,8 +1416,7 @@ ProcQueryTextExtents(client)
 }
 
 int
-ProcListFonts(client)
-    register ClientPtr client;
+ProcListFonts(register ClientPtr client)
 {
     REQUEST(xListFontsReq);
 
@@ -1465,8 +1427,7 @@ ProcListFonts(client)
 }
 
 int
-ProcListFontsWithInfo(client)
-    register ClientPtr client;
+ProcListFontsWithInfo(register ClientPtr client)
 {
     REQUEST(xListFontsWithInfoReq);
 
@@ -1476,19 +1437,19 @@ ProcListFontsWithInfo(client)
 				  (unsigned char *) &stuff[1], stuff->maxNames);
 }
 
-/*ARGSUSED*/
+/**
+ *
+ *  \param value must conform to DeleteType
+ */
 int
-dixDestroyPixmap(value, pid)
-    pointer value; /* must conform to DeleteType */
-    XID pid;
+dixDestroyPixmap(pointer value, XID pid)
 {
     PixmapPtr pPixmap = (PixmapPtr)value;
     return (*pPixmap->drawable.pScreen->DestroyPixmap)(pPixmap);
 }
 
 int
-ProcCreatePixmap(client)
-    register ClientPtr client;
+ProcCreatePixmap(register ClientPtr client)
 {
     PixmapPtr pMap;
     register DrawablePtr pDraw;
@@ -1530,8 +1491,7 @@ CreatePmap:
 }
 
 int
-ProcFreePixmap(client)
-    register ClientPtr client;
+ProcFreePixmap(register ClientPtr client)
 {
     PixmapPtr pMap;
 
@@ -1553,8 +1513,7 @@ ProcFreePixmap(client)
 }
 
 int
-ProcCreateGC(client)
-    register ClientPtr client;
+ProcCreateGC(register ClientPtr client)
 {
     int error;
     GC *pGC;
@@ -1580,8 +1539,7 @@ ProcCreateGC(client)
 }
 
 int
-ProcChangeGC(client)
-    register ClientPtr client;
+ProcChangeGC(register ClientPtr client)
 {
     GC *pGC;
     REQUEST(xChangeGCReq);
@@ -1605,8 +1563,7 @@ ProcChangeGC(client)
 }
 
 int
-ProcCopyGC(client)
-    register ClientPtr client;
+ProcCopyGC(register ClientPtr client)
 {
     register GC *dstGC;
     register GC *pGC;
@@ -1629,8 +1586,7 @@ ProcCopyGC(client)
 }
 
 int
-ProcSetDashes(client)
-    register ClientPtr client;
+ProcSetDashes(register ClientPtr client)
 {
     register GC *pGC;
     int result;
@@ -1657,8 +1613,7 @@ ProcSetDashes(client)
 }
 
 int
-ProcSetClipRectangles(client)
-    register ClientPtr client;
+ProcSetClipRectangles(register ClientPtr client)
 {
     int	nr;
     int result;
@@ -1687,8 +1642,7 @@ ProcSetClipRectangles(client)
 }
 
 int
-ProcFreeGC(client)
-    register ClientPtr client;
+ProcFreeGC(register ClientPtr client)
 {
     register GC *pGC;
     REQUEST(xResourceReq);
@@ -1700,8 +1654,7 @@ ProcFreeGC(client)
 }
 
 int
-ProcClearToBackground(client)
-    register ClientPtr client;
+ProcClearToBackground(register ClientPtr client)
 {
     REQUEST(xClearAreaReq);
     register WindowPtr pWin;
@@ -1728,8 +1681,7 @@ ProcClearToBackground(client)
 }
 
 int
-ProcCopyArea(client)
-    register ClientPtr client;
+ProcCopyArea(register ClientPtr client)
 {
     register DrawablePtr pDst;
     register DrawablePtr pSrc;
@@ -1770,8 +1722,7 @@ ProcCopyArea(client)
 }
 
 int
-ProcCopyPlane(client)
-    register ClientPtr client;
+ProcCopyPlane(register ClientPtr client)
 {
     register DrawablePtr psrcDraw, pdstDraw;
     register GC *pGC;
@@ -1818,8 +1769,7 @@ ProcCopyPlane(client)
 }
 
 int
-ProcPolyPoint(client)
-    register ClientPtr client;
+ProcPolyPoint(register ClientPtr client)
 {
     int npoint;
     register GC *pGC;
@@ -1842,8 +1792,7 @@ ProcPolyPoint(client)
 }
 
 int
-ProcPolyLine(client)
-    register ClientPtr client;
+ProcPolyLine(register ClientPtr client)
 {
     int npoint;
     register GC *pGC;
@@ -1866,8 +1815,7 @@ ProcPolyLine(client)
 }
 
 int
-ProcPolySegment(client)
-    register ClientPtr client;
+ProcPolySegment(register ClientPtr client)
 {
     int nsegs;
     register GC *pGC;
@@ -1886,8 +1834,7 @@ ProcPolySegment(client)
 }
 
 int
-ProcPolyRectangle (client)
-    register ClientPtr client;
+ProcPolyRectangle (register ClientPtr client)
 {
     int nrects;
     register GC *pGC;
@@ -1907,8 +1854,7 @@ ProcPolyRectangle (client)
 }
 
 int
-ProcPolyArc(client)
-    register ClientPtr client;
+ProcPolyArc(register ClientPtr client)
 {
     int		narcs;
     register GC *pGC;
@@ -1927,8 +1873,7 @@ ProcPolyArc(client)
 }
 
 int
-ProcFillPoly(client)
-    register ClientPtr client;
+ProcFillPoly(register ClientPtr client)
 {
     int          things;
     register GC *pGC;
@@ -1959,8 +1904,7 @@ ProcFillPoly(client)
 }
 
 int
-ProcPolyFillRectangle(client)
-    register ClientPtr client;
+ProcPolyFillRectangle(register ClientPtr client)
 {
     int             things;
     register GC *pGC;
@@ -1981,8 +1925,7 @@ ProcPolyFillRectangle(client)
 }
 
 int
-ProcPolyFillArc(client)
-    register ClientPtr client;
+ProcPolyFillArc(register ClientPtr client)
 {
     int		narcs;
     register GC *pGC;
@@ -2055,8 +1998,7 @@ ReformatImage (char *base, int nbytes, int bpp, int order)
  * boundary, even if the scanlines are padded to our satisfaction.
  */
 int
-ProcPutImage(client)
-    register ClientPtr client;
+ProcPutImage(register ClientPtr client)
 {
     register	GC *pGC;
     register	DrawablePtr pDraw;
@@ -2114,13 +2056,9 @@ ProcPutImage(client)
 
 
 int
-DoGetImage(client, format, drawable, x, y, width, height, planemask, im_return)
-    register ClientPtr	client;
-    Drawable drawable;
-    int format;
-    int x, y, width, height;
-    Mask planemask;
-    xGetImageReply **im_return;
+DoGetImage(register ClientPtr client, int format, Drawable drawable, 
+           int x, int y, int width, int height, 
+           Mask planemask, xGetImageReply **im_return)
 {
     register DrawablePtr pDraw;
     int			nlines, linesPerBuf;
@@ -2344,8 +2282,7 @@ DoGetImage(client, format, drawable, x, y, width, height, planemask, im_return)
 }
 
 int
-ProcGetImage(client)
-    register ClientPtr	client;
+ProcGetImage(register ClientPtr client)
 {
     REQUEST(xGetImageReq);
 
@@ -2358,8 +2295,7 @@ ProcGetImage(client)
 }
 
 int
-ProcPolyText(client)
-    register ClientPtr client;
+ProcPolyText(register ClientPtr client)
 {
     int	err;
     REQUEST(xPolyTextReq);
@@ -2388,8 +2324,7 @@ ProcPolyText(client)
 }
 
 int
-ProcImageText8(client)
-    register ClientPtr client;
+ProcImageText8(register ClientPtr client)
 {
     int	err;
     register DrawablePtr pDraw;
@@ -2419,8 +2354,7 @@ ProcImageText8(client)
 }
 
 int
-ProcImageText16(client)
-    register ClientPtr client;
+ProcImageText16(register ClientPtr client)
 {
     int	err;
     register DrawablePtr pDraw;
@@ -2451,8 +2385,7 @@ ProcImageText16(client)
 
 
 int
-ProcCreateColormap(client)
-    register ClientPtr client;
+ProcCreateColormap(register ClientPtr client)
 {
     VisualPtr	pVisual;
     ColormapPtr	pmap;
@@ -2495,8 +2428,7 @@ ProcCreateColormap(client)
 }
 
 int
-ProcFreeColormap(client)
-    register ClientPtr client;
+ProcFreeColormap(register ClientPtr client)
 {
     ColormapPtr pmap;
     REQUEST(xResourceReq);
@@ -2520,8 +2452,7 @@ ProcFreeColormap(client)
 
 
 int
-ProcCopyColormapAndFree(client)
-    register ClientPtr client;
+ProcCopyColormapAndFree(register ClientPtr client)
 {
     Colormap	mid;
     ColormapPtr	pSrcMap;
@@ -2548,8 +2479,7 @@ ProcCopyColormapAndFree(client)
 }
 
 int
-ProcInstallColormap(client)
-    register ClientPtr client;
+ProcInstallColormap(register ClientPtr client)
 {
     ColormapPtr pcmp;
     REQUEST(xResourceReq);
@@ -2570,8 +2500,7 @@ ProcInstallColormap(client)
 }
 
 int
-ProcUninstallColormap(client)
-    register ClientPtr client;
+ProcUninstallColormap(register ClientPtr client)
 {
     ColormapPtr pcmp;
     REQUEST(xResourceReq);
@@ -2593,8 +2522,7 @@ ProcUninstallColormap(client)
 }
 
 int
-ProcListInstalledColormaps(client)
-    register ClientPtr client;
+ProcListInstalledColormaps(register ClientPtr client)
 {
     xListInstalledColormapsReply *preply; 
     int nummaps;
@@ -2629,8 +2557,7 @@ ProcListInstalledColormaps(client)
 }
 
 int
-ProcAllocColor(client)
-    register ClientPtr client;
+ProcAllocColor (register ClientPtr client)
 {
     ColormapPtr pmap;
     int	retval;
@@ -2681,8 +2608,7 @@ ProcAllocColor(client)
 }
 
 int
-ProcAllocNamedColor           (client)
-    register ClientPtr client;
+ProcAllocNamedColor (register ClientPtr client)
 {
     ColormapPtr pcmp;
     REQUEST(xAllocNamedColorReq);
@@ -2743,8 +2669,7 @@ ProcAllocNamedColor           (client)
 }
 
 int
-ProcAllocColorCells           (client)
-    register ClientPtr client;
+ProcAllocColorCells (register ClientPtr client)
 {
     ColormapPtr pcmp;
     REQUEST(xAllocColorCellsReq);
@@ -2819,8 +2744,7 @@ ProcAllocColorCells           (client)
 }
 
 int
-ProcAllocColorPlanes(client)
-    register ClientPtr client;
+ProcAllocColorPlanes(register ClientPtr client)
 {
     ColormapPtr pcmp;
     REQUEST(xAllocColorPlanesReq);
@@ -2893,8 +2817,7 @@ ProcAllocColorPlanes(client)
 }
 
 int
-ProcFreeColors          (client)
-    register ClientPtr client;
+ProcFreeColors(register ClientPtr client)
 {
     ColormapPtr pcmp;
     REQUEST(xFreeColorsReq);
@@ -2929,8 +2852,7 @@ ProcFreeColors          (client)
 }
 
 int
-ProcStoreColors               (client)
-    register ClientPtr client;
+ProcStoreColors (ClientPtr client)
 {
     ColormapPtr pcmp;
     REQUEST(xStoreColorsReq);
@@ -2964,8 +2886,7 @@ ProcStoreColors               (client)
 }
 
 int
-ProcStoreNamedColor           (client)
-    register ClientPtr client;
+ProcStoreNamedColor (register ClientPtr client)
 {
     ColormapPtr pcmp;
     REQUEST(xStoreNamedColorReq);
@@ -2999,8 +2920,7 @@ ProcStoreNamedColor           (client)
 }
 
 int
-ProcQueryColors(client)
-    register ClientPtr client;
+ProcQueryColors(register ClientPtr client)
 {
     ColormapPtr pcmp;
     REQUEST(xQueryColorsReq);
@@ -3051,8 +2971,7 @@ ProcQueryColors(client)
 } 
 
 int
-ProcLookupColor(client)
-    register ClientPtr client;
+ProcLookupColor(register ClientPtr client)
 {
     ColormapPtr pcmp;
     REQUEST(xLookupColorReq);
@@ -3090,8 +3009,7 @@ ProcLookupColor(client)
 }
 
 int
-ProcCreateCursor( client)
-    register ClientPtr client;
+ProcCreateCursor (register ClientPtr client)
 {
     CursorPtr	pCursor;
 
@@ -3181,8 +3099,7 @@ ProcCreateCursor( client)
 }
 
 int
-ProcCreateGlyphCursor( client)
-    register ClientPtr client;
+ProcCreateGlyphCursor (register ClientPtr client)
 {
     CursorPtr pCursor;
     int res;
@@ -3206,8 +3123,7 @@ ProcCreateGlyphCursor( client)
 
 
 int
-ProcFreeCursor(client)
-    register ClientPtr client;
+ProcFreeCursor (register ClientPtr client)
 {
     CursorPtr pCursor;
     REQUEST(xResourceReq);
@@ -3228,8 +3144,7 @@ ProcFreeCursor(client)
 }
 
 int
-ProcQueryBestSize   (client)
-    register ClientPtr client;
+ProcQueryBestSize (register ClientPtr client)
 {
     xQueryBestSizeReply	reply;
     register DrawablePtr pDraw;
@@ -3262,8 +3177,7 @@ ProcQueryBestSize   (client)
 
 
 int
-ProcSetScreenSaver            (client)
-    register ClientPtr client;
+ProcSetScreenSaver (register ClientPtr client)
 {
     int blankingOption, exposureOption;
     REQUEST(xSetScreenSaverReq);
@@ -3319,8 +3233,7 @@ ProcSetScreenSaver            (client)
 }
 
 int
-ProcGetScreenSaver(client)
-    register ClientPtr client;
+ProcGetScreenSaver(register ClientPtr client)
 {
     xGetScreenSaverReply rep;
 
@@ -3337,8 +3250,7 @@ ProcGetScreenSaver(client)
 }
 
 int
-ProcChangeHosts(client)
-    register ClientPtr client;
+ProcChangeHosts(register ClientPtr client)
 {
     REQUEST(xChangeHostsReq);
     int result;
@@ -3362,8 +3274,7 @@ ProcChangeHosts(client)
 }
 
 int
-ProcListHosts(client)
-    register ClientPtr client;
+ProcListHosts(register ClientPtr client)
 {
     xListHostsReply reply;
     int	len, nHosts, result;
@@ -3397,8 +3308,7 @@ ProcListHosts(client)
 }
 
 int
-ProcChangeAccessControl(client)
-    register ClientPtr client;
+ProcChangeAccessControl(register ClientPtr client)
 {
     int result;
     REQUEST(xSetAccessControlReq);
@@ -3416,8 +3326,7 @@ ProcChangeAccessControl(client)
 }
 
 int
-ProcKillClient(client)
-    register ClientPtr client;
+ProcKillClient(register ClientPtr client)
 {
     REQUEST(xResourceReq);
     ClientPtr	killclient;
@@ -3451,8 +3360,7 @@ ProcKillClient(client)
 }
 
 int
-ProcSetFontPath(client)
-    register ClientPtr client;
+ProcSetFontPath(register ClientPtr client)
 {
     unsigned char *ptr;
     unsigned long nbytes, total;
@@ -3487,8 +3395,7 @@ ProcSetFontPath(client)
 }
 
 int
-ProcGetFontPath(client)
-    register ClientPtr client;
+ProcGetFontPath(register ClientPtr client)
 {
     xGetFontPathReply reply;
     int stringLens, numpaths;
@@ -3510,8 +3417,7 @@ ProcGetFontPath(client)
 }
 
 int
-ProcChangeCloseDownMode(client)
-    register ClientPtr client;
+ProcChangeCloseDownMode(register ClientPtr client)
 {
     REQUEST(xSetCloseDownModeReq);
 
@@ -3530,8 +3436,7 @@ ProcChangeCloseDownMode(client)
     }
 }
 
-int ProcForceScreenSaver(client)
-    register ClientPtr client;
+int ProcForceScreenSaver(register ClientPtr client)
 {    
     REQUEST(xForceScreenSaverReq);
 
@@ -3547,8 +3452,7 @@ int ProcForceScreenSaver(client)
     return client->noClientException;
 }
 
-int ProcNoOperation(client)
-    register ClientPtr client;
+int ProcNoOperation(register ClientPtr client)
 {
     REQUEST_AT_LEAST_SIZE(xReq);
     
@@ -3591,8 +3495,7 @@ InitProcVectors(void)
 char dispatchExceptionAtReset = DE_RESET;
 
 void
-CloseDownClient(client)
-    register ClientPtr client;
+CloseDownClient(register ClientPtr client)
 {
     Bool really_close_down = client->clientGone ||
 			     client->closeDownMode == DestroyAll;
@@ -3714,10 +3617,7 @@ CloseDownRetainedResources()
     }
 }
 
-void InitClient(client, i, ospriv)
-    ClientPtr client;
-    int i;
-    pointer ospriv;
+void InitClient(ClientPtr client, int i, pointer ospriv)
 {
     client->index = i;
     client->sequence = 0; 
@@ -3782,8 +3682,7 @@ extern unsigned *clientPrivateSizes;
 extern unsigned totalClientSize;
 
 int
-InitClientPrivates(client)
-    ClientPtr client;
+InitClientPrivates(ClientPtr client)
 {
     register char *ptr;
     DevUnion *ppriv;
@@ -3824,9 +3723,7 @@ InitClientPrivates(client)
  * Returns NULL if there are no free clients.
  *************************/
 
-ClientPtr
-NextAvailableClient(ospriv)
-    pointer ospriv;
+ClientPtr NextAvailableClient(pointer ospriv)
 {
     register int i;
     register ClientPtr client;
@@ -3870,8 +3767,7 @@ NextAvailableClient(ospriv)
 }
 
 int
-ProcInitialConnection(client)
-    register ClientPtr client;
+ProcInitialConnection(register ClientPtr client)
 {
     REQUEST(xReq);
     register xConnClientPrefix *prefix;
@@ -3906,9 +3802,7 @@ IncrementClientCount()
 #endif
 
 int
-SendConnSetup(client, reason)
-    register ClientPtr client;
-    char *reason;
+SendConnSetup(register ClientPtr client, char *reason)
 {
     register xWindowRoot *root;
     register int i;
@@ -4008,8 +3902,7 @@ SendConnSetup(client, reason)
 }
 
 int
-ProcEstablishConnection(client)
-    register ClientPtr client;
+ProcEstablishConnection(register ClientPtr client)
 {
     char *reason, *auth_proto, *auth_string;
     register xConnClientPrefix *prefix;
@@ -4043,12 +3936,8 @@ ProcEstablishConnection(client)
 }
 
 void
-SendErrorToClient(client, majorCode, minorCode, resId, errorCode)
-    ClientPtr client;
-    unsigned int majorCode;
-    unsigned int minorCode;
-    XID resId;
-    int errorCode;
+SendErrorToClient(ClientPtr client, unsigned majorCode, unsigned minorCode, 
+                  XID resId, int errorCode)
 {
     xError rep;
 
@@ -4063,8 +3952,7 @@ SendErrorToClient(client, majorCode, minorCode, resId, errorCode)
 }
 
 void
-DeleteWindowFromAnySelections(pWin)
-    WindowPtr pWin;
+DeleteWindowFromAnySelections(WindowPtr pWin)
 {
     register int i;
 
@@ -4086,8 +3974,7 @@ DeleteWindowFromAnySelections(pWin)
 }
 
 static void
-DeleteClientFromAnySelections(client)
-    ClientPtr client;
+DeleteClientFromAnySelections(ClientPtr client)
 {
     register int i;
 
@@ -4109,8 +3996,7 @@ DeleteClientFromAnySelections(client)
 }
 
 void
-MarkClientException(client)
-    ClientPtr client;
+MarkClientException(ClientPtr client)
 {
     client->noClientException = -1;
 }