From 292311b421e53ead53c7df67d735a3d6d3e5b515 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sun, 11 Jan 2009 08:16:12 +0100 Subject: Xext: ANSI cleanups --- Xext/bigreq.c | 3 +- Xext/dpms.c | 45 ++++++++-------------- Xext/saver.c | 82 +++++++++++++--------------------------- Xext/shape.c | 110 +++++++++++++++++------------------------------------- Xext/sleepuntil.c | 29 ++++---------- Xext/sync.c | 27 ++++++-------- Xext/xace.c | 17 ++++----- Xext/xcmisc.c | 24 ++++-------- Xext/xtest.c | 34 ++++++----------- Xext/xvmain.c | 7 +--- 10 files changed, 124 insertions(+), 254 deletions(-) diff --git a/Xext/bigreq.c b/Xext/bigreq.c index 7ea69a874..8857df37e 100644 --- a/Xext/bigreq.c +++ b/Xext/bigreq.c @@ -51,8 +51,7 @@ BigReqExtensionInit(INITARGS) } static int -ProcBigReqDispatch (client) - ClientPtr client; +ProcBigReqDispatch (ClientPtr client) { REQUEST(xBigReqEnableReq); xBigReqEnableReply rep; diff --git a/Xext/dpms.c b/Xext/dpms.c index bad7aa64f..672cf1764 100644 --- a/Xext/dpms.c +++ b/Xext/dpms.c @@ -78,8 +78,7 @@ DPMSExtensionInit(INITARGS) } static int -ProcDPMSGetVersion(client) - ClientPtr client; +ProcDPMSGetVersion(ClientPtr client) { /* REQUEST(xDPMSGetVersionReq); */ xDPMSGetVersionReply rep; @@ -123,8 +122,7 @@ ProcDPMSCapable(ClientPtr client) } static int -ProcDPMSGetTimeouts(client) - ClientPtr client; +ProcDPMSGetTimeouts(ClientPtr client) { /* REQUEST(xDPMSGetTimeoutsReq); */ xDPMSGetTimeoutsReply rep; @@ -150,8 +148,7 @@ ProcDPMSGetTimeouts(client) } static int -ProcDPMSSetTimeouts(client) - ClientPtr client; +ProcDPMSSetTimeouts(ClientPtr client) { REQUEST(xDPMSSetTimeoutsReq); @@ -177,8 +174,7 @@ ProcDPMSSetTimeouts(client) } static int -ProcDPMSEnable(client) - ClientPtr client; +ProcDPMSEnable(ClientPtr client) { Bool was_enabled = DPMSEnabled; @@ -194,8 +190,7 @@ ProcDPMSEnable(client) } static int -ProcDPMSDisable(client) - ClientPtr client; +ProcDPMSDisable(ClientPtr client) { /* REQUEST(xDPMSDisableReq); */ @@ -209,8 +204,7 @@ ProcDPMSDisable(client) } static int -ProcDPMSForceLevel(client) - ClientPtr client; +ProcDPMSForceLevel(ClientPtr client) { REQUEST(xDPMSForceLevelReq); @@ -265,8 +259,7 @@ ProcDPMSInfo(ClientPtr client) } static int -ProcDPMSDispatch (client) - ClientPtr client; +ProcDPMSDispatch (ClientPtr client) { REQUEST(xReq); @@ -294,8 +287,7 @@ ProcDPMSDispatch (client) } static int -SProcDPMSGetVersion(client) - ClientPtr client; +SProcDPMSGetVersion(ClientPtr client) { int n; REQUEST(xDPMSGetVersionReq); @@ -320,8 +312,7 @@ SProcDPMSCapable(ClientPtr client) } static int -SProcDPMSGetTimeouts(client) - ClientPtr client; +SProcDPMSGetTimeouts(ClientPtr client) { REQUEST(xDPMSGetTimeoutsReq); int n; @@ -333,8 +324,7 @@ SProcDPMSGetTimeouts(client) } static int -SProcDPMSSetTimeouts(client) - ClientPtr client; +SProcDPMSSetTimeouts(ClientPtr client) { REQUEST(xDPMSSetTimeoutsReq); int n; @@ -349,8 +339,7 @@ SProcDPMSSetTimeouts(client) } static int -SProcDPMSEnable(client) - ClientPtr client; +SProcDPMSEnable(ClientPtr client) { REQUEST(xDPMSEnableReq); int n; @@ -362,8 +351,7 @@ SProcDPMSEnable(client) } static int -SProcDPMSDisable(client) - ClientPtr client; +SProcDPMSDisable(ClientPtr client) { REQUEST(xDPMSDisableReq); int n; @@ -375,8 +363,7 @@ SProcDPMSDisable(client) } static int -SProcDPMSForceLevel(client) - ClientPtr client; +SProcDPMSForceLevel(ClientPtr client) { REQUEST(xDPMSForceLevelReq); int n; @@ -390,8 +377,7 @@ SProcDPMSForceLevel(client) } static int -SProcDPMSInfo(client) - ClientPtr client; +SProcDPMSInfo(ClientPtr client) { REQUEST(xDPMSInfoReq); int n; @@ -403,8 +389,7 @@ SProcDPMSInfo(client) } static int -SProcDPMSDispatch (client) - ClientPtr client; +SProcDPMSDispatch (ClientPtr client) { REQUEST(xReq); switch (stuff->data) diff --git a/Xext/saver.c b/Xext/saver.c index 7a5b2c70e..dd8ebe890 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -272,8 +272,7 @@ ScreenSaverExtensionInit(INITARGS) } static void -CheckScreenPrivate (pScreen) - ScreenPtr pScreen; +CheckScreenPrivate (ScreenPtr pScreen) { SetupScreen (pScreen); @@ -289,8 +288,7 @@ CheckScreenPrivate (pScreen) } static ScreenSaverScreenPrivatePtr -MakeScreenPrivate (pScreen) - ScreenPtr pScreen; +MakeScreenPrivate (ScreenPtr pScreen) { SetupScreen (pScreen); @@ -309,9 +307,7 @@ MakeScreenPrivate (pScreen) } static unsigned long -getEventMask (pScreen, client) - ScreenPtr pScreen; - ClientPtr client; +getEventMask (ScreenPtr pScreen, ClientPtr client) { SetupScreen(pScreen); ScreenSaverEventPtr pEv; @@ -325,10 +321,7 @@ getEventMask (pScreen, client) } static Bool -setEventMask (pScreen, client, mask) - ScreenPtr pScreen; - ClientPtr client; - unsigned long mask; +setEventMask (ScreenPtr pScreen, ClientPtr client, unsigned long mask) { SetupScreen(pScreen); ScreenSaverEventPtr pEv, *pPrev; @@ -375,8 +368,7 @@ setEventMask (pScreen, client, mask) } static void -FreeAttrs (pAttr) - ScreenSaverAttrPtr pAttr; +FreeAttrs (ScreenSaverAttrPtr pAttr) { PixmapPtr pPixmap; CursorPtr pCursor; @@ -390,8 +382,7 @@ FreeAttrs (pAttr) } static void -FreeScreenAttr (pAttr) - ScreenSaverAttrPtr pAttr; +FreeScreenAttr (ScreenSaverAttrPtr pAttr) { FreeAttrs (pAttr); xfree (pAttr->values); @@ -399,9 +390,7 @@ FreeScreenAttr (pAttr) } static int -ScreenSaverFreeEvents (value, id) - pointer value; - XID id; +ScreenSaverFreeEvents (pointer value, XID id) { ScreenSaverEventPtr pOld = (ScreenSaverEventPtr)value; ScreenPtr pScreen = pOld->screen; @@ -422,9 +411,7 @@ ScreenSaverFreeEvents (value, id) } static int -ScreenSaverFreeAttr (value, id) - pointer value; - XID id; +ScreenSaverFreeAttr (pointer value, XID id) { ScreenSaverAttrPtr pOldAttr = (ScreenSaverAttrPtr)value; ScreenPtr pScreen = pOldAttr->screen; @@ -485,10 +472,7 @@ ScreenSaverFreeSuspend (pointer value, XID id) } static void -SendScreenSaverNotify (pScreen, state, forced) - ScreenPtr pScreen; - int state; - Bool forced; +SendScreenSaverNotify (ScreenPtr pScreen, int state, Bool forced) { ScreenSaverScreenPrivatePtr pPriv; ScreenSaverEventPtr pEv; @@ -531,8 +515,8 @@ SendScreenSaverNotify (pScreen, state, forced) } static void -SScreenSaverNotifyEvent (from, to) - xScreenSaverNotifyEvent *from, *to; +SScreenSaverNotifyEvent (xScreenSaverNotifyEvent *from, + xScreenSaverNotifyEvent *to) { to->type = from->type; to->state = from->state; @@ -545,8 +529,7 @@ SScreenSaverNotifyEvent (from, to) } static void -UninstallSaverColormap (pScreen) - ScreenPtr pScreen; +UninstallSaverColormap (ScreenPtr pScreen) { SetupScreen(pScreen); ColormapPtr pCmap; @@ -562,8 +545,7 @@ UninstallSaverColormap (pScreen) } static Bool -CreateSaverWindow (pScreen) - ScreenPtr pScreen; +CreateSaverWindow (ScreenPtr pScreen) { SetupScreen (pScreen); ScreenSaverStuffPtr pSaver; @@ -682,8 +664,7 @@ CreateSaverWindow (pScreen) } static Bool -DestroySaverWindow (pScreen) - ScreenPtr pScreen; +DestroySaverWindow (ScreenPtr pScreen) { SetupScreen(pScreen); ScreenSaverStuffPtr pSaver; @@ -704,10 +685,7 @@ DestroySaverWindow (pScreen) } static Bool -ScreenSaverHandle (pScreen, xstate, force) - ScreenPtr pScreen; - int xstate; - Bool force; +ScreenSaverHandle (ScreenPtr pScreen, int xstate, Bool force) { int state = 0; Bool ret = FALSE; @@ -738,8 +716,7 @@ ScreenSaverHandle (pScreen, xstate, force) } static int -ProcScreenSaverQueryVersion (client) - ClientPtr client; +ProcScreenSaverQueryVersion (ClientPtr client) { xScreenSaverQueryVersionReply rep; int n; @@ -759,8 +736,7 @@ ProcScreenSaverQueryVersion (client) } static int -ProcScreenSaverQueryInfo (client) - ClientPtr client; +ProcScreenSaverQueryInfo (ClientPtr client) { REQUEST(xScreenSaverQueryInfoReq); xScreenSaverQueryInfoReply rep; @@ -836,8 +812,7 @@ ProcScreenSaverQueryInfo (client) } static int -ProcScreenSaverSelectInput (client) - ClientPtr client; +ProcScreenSaverSelectInput (ClientPtr client) { REQUEST(xScreenSaverSelectInputReq); DrawablePtr pDraw; @@ -1442,8 +1417,7 @@ static DISPATCH_PROC((*NormalVector[])) = { #define NUM_REQUESTS ((sizeof NormalVector) / (sizeof NormalVector[0])) static int -ProcScreenSaverDispatch (client) - ClientPtr client; +ProcScreenSaverDispatch (ClientPtr client) { REQUEST(xReq); @@ -1453,8 +1427,7 @@ ProcScreenSaverDispatch (client) } static int -SProcScreenSaverQueryVersion (client) - ClientPtr client; +SProcScreenSaverQueryVersion (ClientPtr client) { REQUEST(xScreenSaverQueryVersionReq); int n; @@ -1465,8 +1438,7 @@ SProcScreenSaverQueryVersion (client) } static int -SProcScreenSaverQueryInfo (client) - ClientPtr client; +SProcScreenSaverQueryInfo (ClientPtr client) { REQUEST(xScreenSaverQueryInfoReq); int n; @@ -1478,8 +1450,7 @@ SProcScreenSaverQueryInfo (client) } static int -SProcScreenSaverSelectInput (client) - ClientPtr client; +SProcScreenSaverSelectInput (ClientPtr client) { REQUEST(xScreenSaverSelectInputReq); int n; @@ -1492,8 +1463,7 @@ SProcScreenSaverSelectInput (client) } static int -SProcScreenSaverSetAttributes (client) - ClientPtr client; +SProcScreenSaverSetAttributes (ClientPtr client) { REQUEST(xScreenSaverSetAttributesReq); int n; @@ -1513,8 +1483,7 @@ SProcScreenSaverSetAttributes (client) } static int -SProcScreenSaverUnsetAttributes (client) - ClientPtr client; +SProcScreenSaverUnsetAttributes (ClientPtr client) { REQUEST(xScreenSaverUnsetAttributesReq); int n; @@ -1547,8 +1516,7 @@ static DISPATCH_PROC((*SwappedVector[])) = { }; static int -SProcScreenSaverDispatch (client) - ClientPtr client; +SProcScreenSaverDispatch (ClientPtr client) { REQUEST(xReq); diff --git a/Xext/shape.c b/Xext/shape.c index 8e1da87ba..d8d564390 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -63,18 +63,6 @@ static void SShapeNotifyEvent( xShapeNotifyEvent * /* from */, xShapeNotifyEvent * /* to */ ); -static int -RegionOperate ( - ClientPtr /* client */, - WindowPtr /* pWin */, - int /* kind */, - RegionPtr * /* destRgnp */, - RegionPtr /* srcRgn */, - int /* op */, - int /* xoff */, - int /* yoff */, - CreateDftPtr /* create */ - ); /* SendShapeNotify, CreateBoundingShape and CreateClipShape are used * externally by the Xfixes extension and are now defined in window.h @@ -152,14 +140,15 @@ ShapeExtensionInit(void) } static int -RegionOperate (client, pWin, kind, destRgnp, srcRgn, op, xoff, yoff, create) - ClientPtr client; - WindowPtr pWin; - int kind; - RegionPtr *destRgnp, srcRgn; - int op; - int xoff, yoff; - CreateDftPtr create; /* creates a reasonable *destRgnp */ +RegionOperate ( + ClientPtr client, + WindowPtr pWin, + int kind, + RegionPtr *destRgnp, + RegionPtr srcRgn, + int op, + int xoff, int yoff, + CreateDftPtr create) { ScreenPtr pScreen = pWin->drawable.pScreen; @@ -237,8 +226,7 @@ RegionOperate (client, pWin, kind, destRgnp, srcRgn, op, xoff, yoff, create) } RegionPtr -CreateBoundingShape (pWin) - WindowPtr pWin; +CreateBoundingShape (WindowPtr pWin) { BoxRec extents; @@ -250,8 +238,7 @@ CreateBoundingShape (pWin) } RegionPtr -CreateClipShape (pWin) - WindowPtr pWin; +CreateClipShape (WindowPtr pWin) { BoxRec extents; @@ -263,8 +250,7 @@ CreateClipShape (pWin) } static int -ProcShapeQueryVersion (client) - ClientPtr client; +ProcShapeQueryVersion (ClientPtr client) { xShapeQueryVersionReply rep; int n; @@ -291,8 +277,7 @@ ProcShapeQueryVersion (client) *****************/ static int -ProcShapeRectangles (client) - ClientPtr client; +ProcShapeRectangles (ClientPtr client) { WindowPtr pWin; ScreenPtr pScreen; @@ -391,8 +376,7 @@ ProcPanoramiXShapeRectangles( static int -ProcShapeMask (client) - ClientPtr client; +ProcShapeMask (ClientPtr client) { WindowPtr pWin; ScreenPtr pScreen; @@ -498,8 +482,7 @@ ProcPanoramiXShapeMask( ************/ static int -ProcShapeCombine (client) - ClientPtr client; +ProcShapeCombine (ClientPtr client) { WindowPtr pSrcWin, pDestWin; ScreenPtr pScreen; @@ -622,8 +605,7 @@ ProcPanoramiXShapeCombine( *************/ static int -ProcShapeOffset (client) - ClientPtr client; +ProcShapeOffset (ClientPtr client) { WindowPtr pWin; ScreenPtr pScreen; @@ -687,8 +669,7 @@ ProcPanoramiXShapeOffset( static int -ProcShapeQueryExtents (client) - ClientPtr client; +ProcShapeQueryExtents (ClientPtr client) { REQUEST(xShapeQueryExtentsReq); WindowPtr pWin; @@ -752,9 +733,7 @@ ProcShapeQueryExtents (client) /*ARGSUSED*/ static int -ShapeFreeClient (data, id) - pointer data; - XID id; +ShapeFreeClient (pointer data, XID id) { ShapeEventPtr pShapeEvent; WindowPtr pWin; @@ -781,9 +760,7 @@ ShapeFreeClient (data, id) /*ARGSUSED*/ static int -ShapeFreeEvents (data, id) - pointer data; - XID id; +ShapeFreeEvents (pointer data, XID id) { ShapeEventPtr *pHead, pCur, pNext; @@ -798,8 +775,7 @@ ShapeFreeEvents (data, id) } static int -ProcShapeSelectInput (client) - ClientPtr client; +ProcShapeSelectInput (ClientPtr client) { REQUEST(xShapeSelectInputReq); WindowPtr pWin; @@ -894,9 +870,7 @@ ProcShapeSelectInput (client) */ void -SendShapeNotify (pWin, which) - WindowPtr pWin; - int which; +SendShapeNotify (WindowPtr pWin, int which) { ShapeEventPtr *pHead, pShapeEvent; ClientPtr client; @@ -970,8 +944,7 @@ SendShapeNotify (pWin, which) } static int -ProcShapeInputSelected (client) - ClientPtr client; +ProcShapeInputSelected (ClientPtr client) { REQUEST(xShapeInputSelectedReq); WindowPtr pWin; @@ -1011,8 +984,7 @@ ProcShapeInputSelected (client) } static int -ProcShapeGetRectangles (client) - ClientPtr client; +ProcShapeGetRectangles (ClientPtr client) { REQUEST(xShapeGetRectanglesReq); WindowPtr pWin; @@ -1097,8 +1069,7 @@ ProcShapeGetRectangles (client) } static int -ProcShapeDispatch (client) - ClientPtr client; +ProcShapeDispatch (ClientPtr client) { REQUEST(xReq); switch (stuff->data) { @@ -1146,8 +1117,7 @@ ProcShapeDispatch (client) } static void -SShapeNotifyEvent(from, to) - xShapeNotifyEvent *from, *to; +SShapeNotifyEvent(xShapeNotifyEvent *from, xShapeNotifyEvent *to) { to->type = from->type; to->kind = from->kind; @@ -1162,8 +1132,7 @@ SShapeNotifyEvent(from, to) } static int -SProcShapeQueryVersion (client) - ClientPtr client; +SProcShapeQueryVersion (ClientPtr client) { int n; REQUEST (xShapeQueryVersionReq); @@ -1173,8 +1142,7 @@ SProcShapeQueryVersion (client) } static int -SProcShapeRectangles (client) - ClientPtr client; +SProcShapeRectangles (ClientPtr client) { char n; REQUEST (xShapeRectanglesReq); @@ -1189,8 +1157,7 @@ SProcShapeRectangles (client) } static int -SProcShapeMask (client) - ClientPtr client; +SProcShapeMask (ClientPtr client) { char n; REQUEST (xShapeMaskReq); @@ -1205,8 +1172,7 @@ SProcShapeMask (client) } static int -SProcShapeCombine (client) - ClientPtr client; +SProcShapeCombine (ClientPtr client) { char n; REQUEST (xShapeCombineReq); @@ -1221,8 +1187,7 @@ SProcShapeCombine (client) } static int -SProcShapeOffset (client) - ClientPtr client; +SProcShapeOffset (ClientPtr client) { char n; REQUEST (xShapeOffsetReq); @@ -1236,8 +1201,7 @@ SProcShapeOffset (client) } static int -SProcShapeQueryExtents (client) - ClientPtr client; +SProcShapeQueryExtents (ClientPtr client) { char n; REQUEST (xShapeQueryExtentsReq); @@ -1249,8 +1213,7 @@ SProcShapeQueryExtents (client) } static int -SProcShapeSelectInput (client) - ClientPtr client; +SProcShapeSelectInput (ClientPtr client) { char n; REQUEST (xShapeSelectInputReq); @@ -1262,8 +1225,7 @@ SProcShapeSelectInput (client) } static int -SProcShapeInputSelected (client) - ClientPtr client; +SProcShapeInputSelected (ClientPtr client) { int n; REQUEST (xShapeInputSelectedReq); @@ -1275,8 +1237,7 @@ SProcShapeInputSelected (client) } static int -SProcShapeGetRectangles (client) - ClientPtr client; +SProcShapeGetRectangles (ClientPtr client) { REQUEST(xShapeGetRectanglesReq); char n; @@ -1288,8 +1249,7 @@ SProcShapeGetRectangles (client) } static int -SProcShapeDispatch (client) - ClientPtr client; +SProcShapeDispatch (ClientPtr client) { REQUEST(xReq); switch (stuff->data) { diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c index bedb6f613..4d2a333d0 100644 --- a/Xext/sleepuntil.c +++ b/Xext/sleepuntil.c @@ -78,13 +78,10 @@ static void SertafiedWakeupHandler( ); int -ClientSleepUntil (client, revive, notifyFunc, closure) - ClientPtr client; - TimeStamp *revive; - void (*notifyFunc)( - ClientPtr /* client */, - pointer /* closure */); - pointer closure; +ClientSleepUntil (ClientPtr client, + TimeStamp *revive, + void (*notifyFunc)(ClientPtr, pointer), + pointer closure) { SertafiedPtr pRequest, pReq, pPrev; @@ -138,9 +135,7 @@ ClientSleepUntil (client, revive, notifyFunc, closure) } static void -ClientAwaken (client, closure) - ClientPtr client; - pointer closure; +ClientAwaken (ClientPtr client, pointer closure) { if (!client->clientGone) AttendClient (client); @@ -148,9 +143,7 @@ ClientAwaken (client, closure) static int -SertafiedDelete (value, id) - pointer value; - XID id; +SertafiedDelete (pointer value, XID id) { SertafiedPtr pRequest = (SertafiedPtr)value; SertafiedPtr pReq, pPrev; @@ -172,10 +165,7 @@ SertafiedDelete (value, id) } static void -SertafiedBlockHandler (data, wt, LastSelectMask) - pointer data; /* unused */ - OSTimePtr wt; /* wait time */ - pointer LastSelectMask; +SertafiedBlockHandler (pointer data, OSTimePtr wt, pointer LastSelectMask) { SertafiedPtr pReq, pNext; unsigned long delay; @@ -208,10 +198,7 @@ SertafiedBlockHandler (data, wt, LastSelectMask) } static void -SertafiedWakeupHandler (data, i, LastSelectMask) - pointer data; - int i; - pointer LastSelectMask; +SertafiedWakeupHandler (pointer data, int i, pointer LastSelectMask) { SertafiedPtr pReq, pNext; TimeStamp now; diff --git a/Xext/sync.c b/Xext/sync.c index f8870a77c..d0e7f95e3 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -852,19 +852,17 @@ static int FreeCounter(void *, XID); */ pointer -SyncCreateSystemCounter(name, initial, resolution, counterType, - QueryValue, BracketValues) - char *name; - CARD64 initial; - CARD64 resolution; - SyncCounterType counterType; - void (*QueryValue) ( - pointer /* pCounter */, - CARD64 * /* pValue_return */); - void (*BracketValues) ( - pointer /* pCounter */, - CARD64 * /* pbracket_less */, - CARD64 * /* pbracket_greater */); +SyncCreateSystemCounter( + char *name, + CARD64 initial, + CARD64 resolution, + SyncCounterType counterType, + void (*QueryValue)(pointer /* pCounter */, + CARD64 * /* pValue_return */), + void (*BracketValues)(pointer /* pCounter */, + CARD64 * /* pbracket_less */, + CARD64 * /* pbracket_greater */) + ) { SyncCounter *pCounter; @@ -911,8 +909,7 @@ SyncCreateSystemCounter(name, initial, resolution, counterType, } void -SyncDestroySystemCounter(pSysCounter) - pointer pSysCounter; +SyncDestroySystemCounter(pointer pSysCounter) { SyncCounter *pCounter = (SyncCounter *)pSysCounter; FreeResource(pCounter->id, RT_NONE); diff --git a/Xext/xace.c b/Xext/xace.c index 7e82f810d..86d70fe74 100644 --- a/Xext/xace.c +++ b/Xext/xace.c @@ -244,15 +244,14 @@ int XaceHook(int hook, ...) * region of the window will be destroyed (overwritten) in pBuf. */ void -XaceCensorImage(client, pVisibleRegion, widthBytesLine, pDraw, x, y, w, h, - format, pBuf) - ClientPtr client; - RegionPtr pVisibleRegion; - long widthBytesLine; - DrawablePtr pDraw; - int x, y, w, h; - unsigned int format; - char * pBuf; +XaceCensorImage( + ClientPtr client, + RegionPtr pVisibleRegion, + long widthBytesLine, + DrawablePtr pDraw, + int x, int y, int w, int h, + unsigned int format, + char *pBuf) { ScreenPtr pScreen; RegionRec imageRegion; /* region representing x,y,w,h */ diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index 4f928961d..aed2e4eb4 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -64,8 +64,7 @@ XCMiscExtensionInit(INITARGS) } static int -ProcXCMiscGetVersion(client) - ClientPtr client; +ProcXCMiscGetVersion(ClientPtr client) { xXCMiscGetVersionReply rep; int n; @@ -86,8 +85,7 @@ ProcXCMiscGetVersion(client) } static int -ProcXCMiscGetXIDRange(client) - ClientPtr client; +ProcXCMiscGetXIDRange(ClientPtr client) { xXCMiscGetXIDRangeReply rep; int n; @@ -110,8 +108,7 @@ ProcXCMiscGetXIDRange(client) } static int -ProcXCMiscGetXIDList(client) - ClientPtr client; +ProcXCMiscGetXIDList(ClientPtr client) { REQUEST(xXCMiscGetXIDListReq); xXCMiscGetXIDListReply rep; @@ -150,8 +147,7 @@ ProcXCMiscGetXIDList(client) } static int -ProcXCMiscDispatch (client) - ClientPtr client; +ProcXCMiscDispatch (ClientPtr client) { REQUEST(xReq); switch (stuff->data) @@ -168,8 +164,7 @@ ProcXCMiscDispatch (client) } static int -SProcXCMiscGetVersion(client) - ClientPtr client; +SProcXCMiscGetVersion(ClientPtr client) { int n; REQUEST(xXCMiscGetVersionReq); @@ -182,8 +177,7 @@ SProcXCMiscGetVersion(client) } static int -SProcXCMiscGetXIDRange(client) - ClientPtr client; +SProcXCMiscGetXIDRange(ClientPtr client) { int n; REQUEST(xReq); @@ -193,8 +187,7 @@ SProcXCMiscGetXIDRange(client) } static int -SProcXCMiscGetXIDList(client) - ClientPtr client; +SProcXCMiscGetXIDList(ClientPtr client) { int n; REQUEST(xXCMiscGetXIDListReq); @@ -205,8 +198,7 @@ SProcXCMiscGetXIDList(client) } static int -SProcXCMiscDispatch (client) - ClientPtr client; +SProcXCMiscDispatch (ClientPtr client) { REQUEST(xReq); switch (stuff->data) diff --git a/Xext/xtest.c b/Xext/xtest.c index c6980f05c..2383a8799 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -83,8 +83,7 @@ XTestExtensionInit(INITARGS) } static int -ProcXTestGetVersion(client) - ClientPtr client; +ProcXTestGetVersion(ClientPtr client) { xXTestGetVersionReply rep; int n; @@ -104,8 +103,7 @@ ProcXTestGetVersion(client) } static int -ProcXTestCompareCursor(client) - ClientPtr client; +ProcXTestCompareCursor(ClientPtr client) { REQUEST(xXTestCompareCursorReq); xXTestCompareCursorReply rep; @@ -143,8 +141,7 @@ ProcXTestCompareCursor(client) } static int -ProcXTestFakeInput(client) - ClientPtr client; +ProcXTestFakeInput(ClientPtr client) { REQUEST(xXTestFakeInputReq); int nev, n, type, rc; @@ -402,8 +399,7 @@ ProcXTestFakeInput(client) } static int -ProcXTestGrabControl(client) - ClientPtr client; +ProcXTestGrabControl(ClientPtr client) { REQUEST(xXTestGrabControlReq); @@ -421,8 +417,7 @@ ProcXTestGrabControl(client) } static int -ProcXTestDispatch (client) - ClientPtr client; +ProcXTestDispatch (ClientPtr client) { REQUEST(xReq); switch (stuff->data) @@ -441,8 +436,7 @@ ProcXTestDispatch (client) } static int -SProcXTestGetVersion(client) - ClientPtr client; +SProcXTestGetVersion(ClientPtr client) { int n; REQUEST(xXTestGetVersionReq); @@ -454,8 +448,7 @@ SProcXTestGetVersion(client) } static int -SProcXTestCompareCursor(client) - ClientPtr client; +SProcXTestCompareCursor(ClientPtr client) { int n; REQUEST(xXTestCompareCursorReq); @@ -468,9 +461,7 @@ SProcXTestCompareCursor(client) } static int -XTestSwapFakeInput(client, req) - ClientPtr client; - xReq *req; +XTestSwapFakeInput(ClientPtr client, xReq *req) { int nev; xEvent *ev; @@ -494,8 +485,7 @@ XTestSwapFakeInput(client, req) } static int -SProcXTestFakeInput(client) - ClientPtr client; +SProcXTestFakeInput(ClientPtr client) { int n; REQUEST(xReq); @@ -508,8 +498,7 @@ SProcXTestFakeInput(client) } static int -SProcXTestGrabControl(client) - ClientPtr client; +SProcXTestGrabControl(ClientPtr client) { int n; REQUEST(xXTestGrabControlReq); @@ -520,8 +509,7 @@ SProcXTestGrabControl(client) } static int -SProcXTestDispatch (client) - ClientPtr client; +SProcXTestDispatch (ClientPtr client) { REQUEST(xReq); switch (stuff->data) diff --git a/Xext/xvmain.c b/Xext/xvmain.c index f5c80f379..6184e4e77 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -520,12 +520,7 @@ XvdiDestroyEncoding(pointer value, XID id) } static int -XvdiSendVideoNotify(pPort, pDraw, reason) - -XvPortPtr pPort; -DrawablePtr pDraw; -int reason; - +XvdiSendVideoNotify(XvPortPtr pPort, DrawablePtr pDraw, int reason) { xvEvent event; XvVideoNotifyPtr pn; -- cgit v1.2.3