frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xext: ANSI cleanups

This commit is contained in:
Julien Cristau 2009-01-11 08:16:12 +01:00
parent 7a05c8b1e7
commit 292311b421
10 changed files with 124 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Xext/bigreq.c
View File

@ -51,8 +51,7 @@ BigReqExtensionInit(INITARGS)
} }
static int static int
ProcBigReqDispatch (client) ProcBigReqDispatch (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xBigReqEnableReq); REQUEST(xBigReqEnableReq);
xBigReqEnableReply rep; xBigReqEnableReply rep;

45
Xext/dpms.c
View File

@ -78,8 +78,7 @@ DPMSExtensionInit(INITARGS)
} }
static int static int
ProcDPMSGetVersion(client) ProcDPMSGetVersion(ClientPtr client)
ClientPtr client;
{ {
/* REQUEST(xDPMSGetVersionReq); */ /* REQUEST(xDPMSGetVersionReq); */
xDPMSGetVersionReply rep; xDPMSGetVersionReply rep;
@ -123,8 +122,7 @@ ProcDPMSCapable(ClientPtr client)
} }
static int static int
ProcDPMSGetTimeouts(client) ProcDPMSGetTimeouts(ClientPtr client)
ClientPtr client;
{ {
/* REQUEST(xDPMSGetTimeoutsReq); */ /* REQUEST(xDPMSGetTimeoutsReq); */
xDPMSGetTimeoutsReply rep; xDPMSGetTimeoutsReply rep;
@ -150,8 +148,7 @@ ProcDPMSGetTimeouts(client)
} }
static int static int
ProcDPMSSetTimeouts(client) ProcDPMSSetTimeouts(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xDPMSSetTimeoutsReq); REQUEST(xDPMSSetTimeoutsReq);
@ -177,8 +174,7 @@ ProcDPMSSetTimeouts(client)
} }
static int static int
ProcDPMSEnable(client) ProcDPMSEnable(ClientPtr client)
ClientPtr client;
{ {
Bool was_enabled = DPMSEnabled; Bool was_enabled = DPMSEnabled;
@ -194,8 +190,7 @@ ProcDPMSEnable(client)
} }
static int static int
ProcDPMSDisable(client) ProcDPMSDisable(ClientPtr client)
ClientPtr client;
{ {
/* REQUEST(xDPMSDisableReq); */ /* REQUEST(xDPMSDisableReq); */
@ -209,8 +204,7 @@ ProcDPMSDisable(client)
} }
static int static int
ProcDPMSForceLevel(client) ProcDPMSForceLevel(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xDPMSForceLevelReq); REQUEST(xDPMSForceLevelReq);
@ -265,8 +259,7 @@ ProcDPMSInfo(ClientPtr client)
} }
static int static int
ProcDPMSDispatch (client) ProcDPMSDispatch (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xReq); REQUEST(xReq);
@ -294,8 +287,7 @@ ProcDPMSDispatch (client)
} }
static int static int
SProcDPMSGetVersion(client) SProcDPMSGetVersion(ClientPtr client)
ClientPtr client;
{ {
int n; int n;
REQUEST(xDPMSGetVersionReq); REQUEST(xDPMSGetVersionReq);
@ -320,8 +312,7 @@ SProcDPMSCapable(ClientPtr client)
} }
static int static int
SProcDPMSGetTimeouts(client) SProcDPMSGetTimeouts(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xDPMSGetTimeoutsReq); REQUEST(xDPMSGetTimeoutsReq);
int n; int n;
@ -333,8 +324,7 @@ SProcDPMSGetTimeouts(client)
} }
static int static int
SProcDPMSSetTimeouts(client) SProcDPMSSetTimeouts(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xDPMSSetTimeoutsReq); REQUEST(xDPMSSetTimeoutsReq);
int n; int n;
@ -349,8 +339,7 @@ SProcDPMSSetTimeouts(client)
} }
static int static int
SProcDPMSEnable(client) SProcDPMSEnable(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xDPMSEnableReq); REQUEST(xDPMSEnableReq);
int n; int n;
@ -362,8 +351,7 @@ SProcDPMSEnable(client)
} }
static int static int
SProcDPMSDisable(client) SProcDPMSDisable(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xDPMSDisableReq); REQUEST(xDPMSDisableReq);
int n; int n;
@ -375,8 +363,7 @@ SProcDPMSDisable(client)
} }
static int static int
SProcDPMSForceLevel(client) SProcDPMSForceLevel(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xDPMSForceLevelReq); REQUEST(xDPMSForceLevelReq);
int n; int n;
@ -390,8 +377,7 @@ SProcDPMSForceLevel(client)
} }
static int static int
SProcDPMSInfo(client) SProcDPMSInfo(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xDPMSInfoReq); REQUEST(xDPMSInfoReq);
int n; int n;
@ -403,8 +389,7 @@ SProcDPMSInfo(client)
} }
static int static int
SProcDPMSDispatch (client) SProcDPMSDispatch (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xReq); REQUEST(xReq);
switch (stuff->data) switch (stuff->data)

82
Xext/saver.c
View File

@ -272,8 +272,7 @@ ScreenSaverExtensionInit(INITARGS)
} }
static void static void
CheckScreenPrivate (pScreen) CheckScreenPrivate (ScreenPtr pScreen)
ScreenPtr pScreen;
{ {
SetupScreen (pScreen); SetupScreen (pScreen);
@ -289,8 +288,7 @@ CheckScreenPrivate (pScreen)
} }
static ScreenSaverScreenPrivatePtr static ScreenSaverScreenPrivatePtr
MakeScreenPrivate (pScreen) MakeScreenPrivate (ScreenPtr pScreen)
ScreenPtr pScreen;
{ {
SetupScreen (pScreen); SetupScreen (pScreen);
@ -309,9 +307,7 @@ MakeScreenPrivate (pScreen)
} }
static unsigned long static unsigned long
getEventMask (pScreen, client) getEventMask (ScreenPtr pScreen, ClientPtr client)
ScreenPtr pScreen;
ClientPtr client;
{ {
SetupScreen(pScreen); SetupScreen(pScreen);
ScreenSaverEventPtr pEv; ScreenSaverEventPtr pEv;
@ -325,10 +321,7 @@ getEventMask (pScreen, client)
} }
static Bool static Bool
setEventMask (pScreen, client, mask) setEventMask (ScreenPtr pScreen, ClientPtr client, unsigned long mask)
ScreenPtr pScreen;
ClientPtr client;
unsigned long mask;
{ {
SetupScreen(pScreen); SetupScreen(pScreen);
ScreenSaverEventPtr pEv, *pPrev; ScreenSaverEventPtr pEv, *pPrev;
@ -375,8 +368,7 @@ setEventMask (pScreen, client, mask)
} }
static void static void
FreeAttrs (pAttr) FreeAttrs (ScreenSaverAttrPtr pAttr)
ScreenSaverAttrPtr pAttr;
{ {
PixmapPtr pPixmap; PixmapPtr pPixmap;
CursorPtr pCursor; CursorPtr pCursor;
@ -390,8 +382,7 @@ FreeAttrs (pAttr)
} }
static void static void
FreeScreenAttr (pAttr) FreeScreenAttr (ScreenSaverAttrPtr pAttr)
ScreenSaverAttrPtr pAttr;
{ {
FreeAttrs (pAttr); FreeAttrs (pAttr);
xfree (pAttr->values); xfree (pAttr->values);
@ -399,9 +390,7 @@ FreeScreenAttr (pAttr)
} }
static int static int
ScreenSaverFreeEvents (value, id) ScreenSaverFreeEvents (pointer value, XID id)
pointer value;
XID id;
{ {
ScreenSaverEventPtr pOld = (ScreenSaverEventPtr)value; ScreenSaverEventPtr pOld = (ScreenSaverEventPtr)value;
ScreenPtr pScreen = pOld->screen; ScreenPtr pScreen = pOld->screen;
@ -422,9 +411,7 @@ ScreenSaverFreeEvents (value, id)
} }
static int static int
ScreenSaverFreeAttr (value, id) ScreenSaverFreeAttr (pointer value, XID id)
pointer value;
XID id;
{ {
ScreenSaverAttrPtr pOldAttr = (ScreenSaverAttrPtr)value; ScreenSaverAttrPtr pOldAttr = (ScreenSaverAttrPtr)value;
ScreenPtr pScreen = pOldAttr->screen; ScreenPtr pScreen = pOldAttr->screen;
@ -485,10 +472,7 @@ ScreenSaverFreeSuspend (pointer value, XID id)
} }
static void static void
SendScreenSaverNotify (pScreen, state, forced) SendScreenSaverNotify (ScreenPtr pScreen, int state, Bool forced)
ScreenPtr pScreen;
int state;
Bool forced;
{ {
ScreenSaverScreenPrivatePtr pPriv; ScreenSaverScreenPrivatePtr pPriv;
ScreenSaverEventPtr pEv; ScreenSaverEventPtr pEv;
@ -531,8 +515,8 @@ SendScreenSaverNotify (pScreen, state, forced)
} }
static void static void
SScreenSaverNotifyEvent (from, to) SScreenSaverNotifyEvent (xScreenSaverNotifyEvent *from,
xScreenSaverNotifyEvent *from, *to; xScreenSaverNotifyEvent *to)
{ {
to->type = from->type; to->type = from->type;
to->state = from->state; to->state = from->state;
@ -545,8 +529,7 @@ SScreenSaverNotifyEvent (from, to)
} }
static void static void
UninstallSaverColormap (pScreen) UninstallSaverColormap (ScreenPtr pScreen)
ScreenPtr pScreen;
{ {
SetupScreen(pScreen); SetupScreen(pScreen);
ColormapPtr pCmap; ColormapPtr pCmap;
@ -562,8 +545,7 @@ UninstallSaverColormap (pScreen)
} }
static Bool static Bool
CreateSaverWindow (pScreen) CreateSaverWindow (ScreenPtr pScreen)
ScreenPtr pScreen;
{ {
SetupScreen (pScreen); SetupScreen (pScreen);
ScreenSaverStuffPtr pSaver; ScreenSaverStuffPtr pSaver;
@ -682,8 +664,7 @@ CreateSaverWindow (pScreen)
} }
static Bool static Bool
DestroySaverWindow (pScreen) DestroySaverWindow (ScreenPtr pScreen)
ScreenPtr pScreen;
{ {
SetupScreen(pScreen); SetupScreen(pScreen);
ScreenSaverStuffPtr pSaver; ScreenSaverStuffPtr pSaver;
@ -704,10 +685,7 @@ DestroySaverWindow (pScreen)
} }
static Bool static Bool
ScreenSaverHandle (pScreen, xstate, force) ScreenSaverHandle (ScreenPtr pScreen, int xstate, Bool force)
ScreenPtr pScreen;
int xstate;
Bool force;
{ {
int state = 0; int state = 0;
Bool ret = FALSE; Bool ret = FALSE;
@ -738,8 +716,7 @@ ScreenSaverHandle (pScreen, xstate, force)
} }
static int static int
ProcScreenSaverQueryVersion (client) ProcScreenSaverQueryVersion (ClientPtr client)
ClientPtr client;
{ {
xScreenSaverQueryVersionReply rep; xScreenSaverQueryVersionReply rep;
int n; int n;
@ -759,8 +736,7 @@ ProcScreenSaverQueryVersion (client)
} }
static int static int
ProcScreenSaverQueryInfo (client) ProcScreenSaverQueryInfo (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xScreenSaverQueryInfoReq); REQUEST(xScreenSaverQueryInfoReq);
xScreenSaverQueryInfoReply rep; xScreenSaverQueryInfoReply rep;
@ -836,8 +812,7 @@ ProcScreenSaverQueryInfo (client)
} }
static int static int
ProcScreenSaverSelectInput (client) ProcScreenSaverSelectInput (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xScreenSaverSelectInputReq); REQUEST(xScreenSaverSelectInputReq);
DrawablePtr pDraw; DrawablePtr pDraw;
@ -1442,8 +1417,7 @@ static DISPATCH_PROC((*NormalVector[])) = {
#define NUM_REQUESTS ((sizeof NormalVector) / (sizeof NormalVector[0])) #define NUM_REQUESTS ((sizeof NormalVector) / (sizeof NormalVector[0]))
static int static int
ProcScreenSaverDispatch (client) ProcScreenSaverDispatch (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xReq); REQUEST(xReq);
@ -1453,8 +1427,7 @@ ProcScreenSaverDispatch (client)
} }
static int static int
SProcScreenSaverQueryVersion (client) SProcScreenSaverQueryVersion (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xScreenSaverQueryVersionReq); REQUEST(xScreenSaverQueryVersionReq);
int n; int n;
@ -1465,8 +1438,7 @@ SProcScreenSaverQueryVersion (client)
} }
static int static int
SProcScreenSaverQueryInfo (client) SProcScreenSaverQueryInfo (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xScreenSaverQueryInfoReq); REQUEST(xScreenSaverQueryInfoReq);
int n; int n;
@ -1478,8 +1450,7 @@ SProcScreenSaverQueryInfo (client)
} }
static int static int
SProcScreenSaverSelectInput (client) SProcScreenSaverSelectInput (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xScreenSaverSelectInputReq); REQUEST(xScreenSaverSelectInputReq);
int n; int n;
@ -1492,8 +1463,7 @@ SProcScreenSaverSelectInput (client)
} }
static int static int
SProcScreenSaverSetAttributes (client) SProcScreenSaverSetAttributes (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xScreenSaverSetAttributesReq); REQUEST(xScreenSaverSetAttributesReq);
int n; int n;
@ -1513,8 +1483,7 @@ SProcScreenSaverSetAttributes (client)
} }
static int static int
SProcScreenSaverUnsetAttributes (client) SProcScreenSaverUnsetAttributes (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xScreenSaverUnsetAttributesReq); REQUEST(xScreenSaverUnsetAttributesReq);
int n; int n;
@ -1547,8 +1516,7 @@ static DISPATCH_PROC((*SwappedVector[])) = {
}; };
static int static int
SProcScreenSaverDispatch (client) SProcScreenSaverDispatch (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xReq); REQUEST(xReq);

110
Xext/shape.c
View File

@ -63,18 +63,6 @@ static void SShapeNotifyEvent(
xShapeNotifyEvent * /* from */, xShapeNotifyEvent * /* from */,
xShapeNotifyEvent * /* to */ 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 /* SendShapeNotify, CreateBoundingShape and CreateClipShape are used
* externally by the Xfixes extension and are now defined in window.h * externally by the Xfixes extension and are now defined in window.h
@ -152,14 +140,15 @@ ShapeExtensionInit(void)
} }
static int static int
RegionOperate (client, pWin, kind, destRgnp, srcRgn, op, xoff, yoff, create) RegionOperate (
ClientPtr client; ClientPtr client,
WindowPtr pWin; WindowPtr pWin,
int kind; int kind,
RegionPtr *destRgnp, srcRgn; RegionPtr *destRgnp,
int op; RegionPtr srcRgn,
int xoff, yoff; int op,
CreateDftPtr create; /* creates a reasonable *destRgnp */ int xoff, int yoff,
CreateDftPtr create)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
@ -237,8 +226,7 @@ RegionOperate (client, pWin, kind, destRgnp, srcRgn, op, xoff, yoff, create)
} }
RegionPtr RegionPtr
CreateBoundingShape (pWin) CreateBoundingShape (WindowPtr pWin)
WindowPtr pWin;
{ {
BoxRec extents; BoxRec extents;
@ -250,8 +238,7 @@ CreateBoundingShape (pWin)
} }
RegionPtr RegionPtr
CreateClipShape (pWin) CreateClipShape (WindowPtr pWin)
WindowPtr pWin;
{ {
BoxRec extents; BoxRec extents;
@ -263,8 +250,7 @@ CreateClipShape (pWin)
} }
static int static int
ProcShapeQueryVersion (client) ProcShapeQueryVersion (ClientPtr client)
ClientPtr client;
{ {
xShapeQueryVersionReply rep; xShapeQueryVersionReply rep;
int n; int n;
@ -291,8 +277,7 @@ ProcShapeQueryVersion (client)
*****************/ *****************/
static int static int
ProcShapeRectangles (client) ProcShapeRectangles (ClientPtr client)
ClientPtr client;
{ {
WindowPtr pWin; WindowPtr pWin;
ScreenPtr pScreen; ScreenPtr pScreen;
@ -391,8 +376,7 @@ ProcPanoramiXShapeRectangles(
static int static int
ProcShapeMask (client) ProcShapeMask (ClientPtr client)
ClientPtr client;
{ {
WindowPtr pWin; WindowPtr pWin;
ScreenPtr pScreen; ScreenPtr pScreen;
@ -498,8 +482,7 @@ ProcPanoramiXShapeMask(
************/ ************/
static int static int
ProcShapeCombine (client) ProcShapeCombine (ClientPtr client)
ClientPtr client;
{ {
WindowPtr pSrcWin, pDestWin; WindowPtr pSrcWin, pDestWin;
ScreenPtr pScreen; ScreenPtr pScreen;
@ -622,8 +605,7 @@ ProcPanoramiXShapeCombine(
*************/ *************/
static int static int
ProcShapeOffset (client) ProcShapeOffset (ClientPtr client)
ClientPtr client;
{ {
WindowPtr pWin; WindowPtr pWin;
ScreenPtr pScreen; ScreenPtr pScreen;
@ -687,8 +669,7 @@ ProcPanoramiXShapeOffset(
static int static int
ProcShapeQueryExtents (client) ProcShapeQueryExtents (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xShapeQueryExtentsReq); REQUEST(xShapeQueryExtentsReq);
WindowPtr pWin; WindowPtr pWin;
@ -752,9 +733,7 @@ ProcShapeQueryExtents (client)
/*ARGSUSED*/ /*ARGSUSED*/
static int static int
ShapeFreeClient (data, id) ShapeFreeClient (pointer data, XID id)
pointer data;
XID id;
{ {
ShapeEventPtr pShapeEvent; ShapeEventPtr pShapeEvent;
WindowPtr pWin; WindowPtr pWin;
@ -781,9 +760,7 @@ ShapeFreeClient (data, id)
/*ARGSUSED*/ /*ARGSUSED*/
static int static int
ShapeFreeEvents (data, id) ShapeFreeEvents (pointer data, XID id)
pointer data;
XID id;
{ {
ShapeEventPtr *pHead, pCur, pNext; ShapeEventPtr *pHead, pCur, pNext;
@ -798,8 +775,7 @@ ShapeFreeEvents (data, id)
} }
static int static int
ProcShapeSelectInput (client) ProcShapeSelectInput (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xShapeSelectInputReq); REQUEST(xShapeSelectInputReq);
WindowPtr pWin; WindowPtr pWin;
@ -894,9 +870,7 @@ ProcShapeSelectInput (client)
*/ */
void void
SendShapeNotify (pWin, which) SendShapeNotify (WindowPtr pWin, int which)
WindowPtr pWin;
int which;
{ {
ShapeEventPtr *pHead, pShapeEvent; ShapeEventPtr *pHead, pShapeEvent;
ClientPtr client; ClientPtr client;
@ -970,8 +944,7 @@ SendShapeNotify (pWin, which)
} }
static int static int
ProcShapeInputSelected (client) ProcShapeInputSelected (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xShapeInputSelectedReq); REQUEST(xShapeInputSelectedReq);
WindowPtr pWin; WindowPtr pWin;
@ -1011,8 +984,7 @@ ProcShapeInputSelected (client)
} }
static int static int
ProcShapeGetRectangles (client) ProcShapeGetRectangles (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xShapeGetRectanglesReq); REQUEST(xShapeGetRectanglesReq);
WindowPtr pWin; WindowPtr pWin;
@ -1097,8 +1069,7 @@ ProcShapeGetRectangles (client)
} }
static int static int
ProcShapeDispatch (client) ProcShapeDispatch (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xReq); REQUEST(xReq);
switch (stuff->data) { switch (stuff->data) {
@ -1146,8 +1117,7 @@ ProcShapeDispatch (client)
} }
static void static void
SShapeNotifyEvent(from, to) SShapeNotifyEvent(xShapeNotifyEvent *from, xShapeNotifyEvent *to)
xShapeNotifyEvent *from, *to;
{ {
to->type = from->type; to->type = from->type;
to->kind = from->kind; to->kind = from->kind;
@ -1162,8 +1132,7 @@ SShapeNotifyEvent(from, to)
} }
static int static int
SProcShapeQueryVersion (client) SProcShapeQueryVersion (ClientPtr client)
ClientPtr client;
{ {
int n; int n;
REQUEST (xShapeQueryVersionReq); REQUEST (xShapeQueryVersionReq);
@ -1173,8 +1142,7 @@ SProcShapeQueryVersion (client)
} }
static int static int
SProcShapeRectangles (client) SProcShapeRectangles (ClientPtr client)
ClientPtr client;
{ {
char n; char n;
REQUEST (xShapeRectanglesReq); REQUEST (xShapeRectanglesReq);
@ -1189,8 +1157,7 @@ SProcShapeRectangles (client)
} }
static int static int
SProcShapeMask (client) SProcShapeMask (ClientPtr client)
ClientPtr client;
{ {
char n; char n;
REQUEST (xShapeMaskReq); REQUEST (xShapeMaskReq);
@ -1205,8 +1172,7 @@ SProcShapeMask (client)
} }
static int static int
SProcShapeCombine (client) SProcShapeCombine (ClientPtr client)
ClientPtr client;
{ {
char n; char n;
REQUEST (xShapeCombineReq); REQUEST (xShapeCombineReq);
@ -1221,8 +1187,7 @@ SProcShapeCombine (client)
} }
static int static int
SProcShapeOffset (client) SProcShapeOffset (ClientPtr client)
ClientPtr client;
{ {
char n; char n;
REQUEST (xShapeOffsetReq); REQUEST (xShapeOffsetReq);
@ -1236,8 +1201,7 @@ SProcShapeOffset (client)
} }
static int static int
SProcShapeQueryExtents (client) SProcShapeQueryExtents (ClientPtr client)
ClientPtr client;
{ {
char n; char n;
REQUEST (xShapeQueryExtentsReq); REQUEST (xShapeQueryExtentsReq);
@ -1249,8 +1213,7 @@ SProcShapeQueryExtents (client)
} }
static int static int
SProcShapeSelectInput (client) SProcShapeSelectInput (ClientPtr client)
ClientPtr client;
{ {
char n; char n;
REQUEST (xShapeSelectInputReq); REQUEST (xShapeSelectInputReq);
@ -1262,8 +1225,7 @@ SProcShapeSelectInput (client)
} }
static int static int
SProcShapeInputSelected (client) SProcShapeInputSelected (ClientPtr client)
ClientPtr client;
{ {
int n; int n;
REQUEST (xShapeInputSelectedReq); REQUEST (xShapeInputSelectedReq);
@ -1275,8 +1237,7 @@ SProcShapeInputSelected (client)
} }
static int static int
SProcShapeGetRectangles (client) SProcShapeGetRectangles (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xShapeGetRectanglesReq); REQUEST(xShapeGetRectanglesReq);
char n; char n;
@ -1288,8 +1249,7 @@ SProcShapeGetRectangles (client)
} }
static int static int
SProcShapeDispatch (client) SProcShapeDispatch (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xReq); REQUEST(xReq);
switch (stuff->data) { switch (stuff->data) {

29
Xext/sleepuntil.c
View File

@ -78,13 +78,10 @@ static void SertafiedWakeupHandler(
); );
int int
ClientSleepUntil (client, revive, notifyFunc, closure) ClientSleepUntil (ClientPtr client,
ClientPtr client; TimeStamp *revive,
TimeStamp *revive; void (*notifyFunc)(ClientPtr, pointer),
void (*notifyFunc)( pointer closure)
ClientPtr /* client */,
pointer /* closure */);
pointer closure;
{ {
SertafiedPtr pRequest, pReq, pPrev; SertafiedPtr pRequest, pReq, pPrev;
@ -138,9 +135,7 @@ ClientSleepUntil (client, revive, notifyFunc, closure)
} }
static void static void
ClientAwaken (client, closure) ClientAwaken (ClientPtr client, pointer closure)
ClientPtr client;
pointer closure;
{ {
if (!client->clientGone) if (!client->clientGone)
AttendClient (client); AttendClient (client);
@ -148,9 +143,7 @@ ClientAwaken (client, closure)
static int static int
SertafiedDelete (value, id) SertafiedDelete (pointer value, XID id)
pointer value;
XID id;
{ {
SertafiedPtr pRequest = (SertafiedPtr)value; SertafiedPtr pRequest = (SertafiedPtr)value;
SertafiedPtr pReq, pPrev; SertafiedPtr pReq, pPrev;
@ -172,10 +165,7 @@ SertafiedDelete (value, id)
} }
static void static void
SertafiedBlockHandler (data, wt, LastSelectMask) SertafiedBlockHandler (pointer data, OSTimePtr wt, pointer LastSelectMask)
pointer data; /* unused */
OSTimePtr wt; /* wait time */
pointer LastSelectMask;
{ {
SertafiedPtr pReq, pNext; SertafiedPtr pReq, pNext;
unsigned long delay; unsigned long delay;
@ -208,10 +198,7 @@ SertafiedBlockHandler (data, wt, LastSelectMask)
} }
static void static void
SertafiedWakeupHandler (data, i, LastSelectMask) SertafiedWakeupHandler (pointer data, int i, pointer LastSelectMask)
pointer data;
int i;
pointer LastSelectMask;
{ {
SertafiedPtr pReq, pNext; SertafiedPtr pReq, pNext;
TimeStamp now; TimeStamp now;

25
Xext/sync.c
View File

@ -852,19 +852,17 @@ static int FreeCounter(void *, XID);
*/ */
pointer pointer
SyncCreateSystemCounter(name, initial, resolution, counterType, SyncCreateSystemCounter(
QueryValue, BracketValues) char *name,
char *name; CARD64 initial,
CARD64 initial; CARD64 resolution,
CARD64 resolution; SyncCounterType counterType,
SyncCounterType counterType; void (*QueryValue)(pointer /* pCounter */,
void (*QueryValue) ( CARD64 * /* pValue_return */),
pointer /* pCounter */, void (*BracketValues)(pointer /* pCounter */,
CARD64 * /* pValue_return */);
void (*BracketValues) (
pointer /* pCounter */,
CARD64 * /* pbracket_less */, CARD64 * /* pbracket_less */,
CARD64 * /* pbracket_greater */); CARD64 * /* pbracket_greater */)
)
{ {
SyncCounter *pCounter; SyncCounter *pCounter;
@ -911,8 +909,7 @@ SyncCreateSystemCounter(name, initial, resolution, counterType,
} }
void void
SyncDestroySystemCounter(pSysCounter) SyncDestroySystemCounter(pointer pSysCounter)
pointer pSysCounter;
{ {
SyncCounter *pCounter = (SyncCounter *)pSysCounter; SyncCounter *pCounter = (SyncCounter *)pSysCounter;
FreeResource(pCounter->id, RT_NONE); FreeResource(pCounter->id, RT_NONE);

17
Xext/xace.c
View File

@ -244,15 +244,14 @@ int XaceHook(int hook, ...)
* region of the window will be destroyed (overwritten) in pBuf. * region of the window will be destroyed (overwritten) in pBuf.
*/ */
void void
XaceCensorImage(client, pVisibleRegion, widthBytesLine, pDraw, x, y, w, h, XaceCensorImage(
format, pBuf) ClientPtr client,
ClientPtr client; RegionPtr pVisibleRegion,
RegionPtr pVisibleRegion; long widthBytesLine,
long widthBytesLine; DrawablePtr pDraw,
DrawablePtr pDraw; int x, int y, int w, int h,
int x, y, w, h; unsigned int format,
unsigned int format; char *pBuf)
char * pBuf;
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
RegionRec imageRegion; /* region representing x,y,w,h */ RegionRec imageRegion; /* region representing x,y,w,h */

24
Xext/xcmisc.c
View File

@ -64,8 +64,7 @@ XCMiscExtensionInit(INITARGS)
} }
static int static int
ProcXCMiscGetVersion(client) ProcXCMiscGetVersion(ClientPtr client)
ClientPtr client;
{ {
xXCMiscGetVersionReply rep; xXCMiscGetVersionReply rep;
int n; int n;
@ -86,8 +85,7 @@ ProcXCMiscGetVersion(client)
} }
static int static int
ProcXCMiscGetXIDRange(client) ProcXCMiscGetXIDRange(ClientPtr client)
ClientPtr client;
{ {
xXCMiscGetXIDRangeReply rep; xXCMiscGetXIDRangeReply rep;
int n; int n;
@ -110,8 +108,7 @@ ProcXCMiscGetXIDRange(client)
} }
static int static int
ProcXCMiscGetXIDList(client) ProcXCMiscGetXIDList(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xXCMiscGetXIDListReq); REQUEST(xXCMiscGetXIDListReq);
xXCMiscGetXIDListReply rep; xXCMiscGetXIDListReply rep;
@ -150,8 +147,7 @@ ProcXCMiscGetXIDList(client)
} }
static int static int
ProcXCMiscDispatch (client) ProcXCMiscDispatch (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xReq); REQUEST(xReq);
switch (stuff->data) switch (stuff->data)
@ -168,8 +164,7 @@ ProcXCMiscDispatch (client)
} }
static int static int
SProcXCMiscGetVersion(client) SProcXCMiscGetVersion(ClientPtr client)
ClientPtr client;
{ {
int n; int n;
REQUEST(xXCMiscGetVersionReq); REQUEST(xXCMiscGetVersionReq);
@ -182,8 +177,7 @@ SProcXCMiscGetVersion(client)
} }
static int static int
SProcXCMiscGetXIDRange(client) SProcXCMiscGetXIDRange(ClientPtr client)
ClientPtr client;
{ {
int n; int n;
REQUEST(xReq); REQUEST(xReq);
@ -193,8 +187,7 @@ SProcXCMiscGetXIDRange(client)
} }
static int static int
SProcXCMiscGetXIDList(client) SProcXCMiscGetXIDList(ClientPtr client)
ClientPtr client;
{ {
int n; int n;
REQUEST(xXCMiscGetXIDListReq); REQUEST(xXCMiscGetXIDListReq);
@ -205,8 +198,7 @@ SProcXCMiscGetXIDList(client)
} }
static int static int
SProcXCMiscDispatch (client) SProcXCMiscDispatch (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xReq); REQUEST(xReq);
switch (stuff->data) switch (stuff->data)

34
Xext/xtest.c
View File

@ -83,8 +83,7 @@ XTestExtensionInit(INITARGS)
} }
static int static int
ProcXTestGetVersion(client) ProcXTestGetVersion(ClientPtr client)
ClientPtr client;
{ {
xXTestGetVersionReply rep; xXTestGetVersionReply rep;
int n; int n;
@ -104,8 +103,7 @@ ProcXTestGetVersion(client)
} }
static int static int
ProcXTestCompareCursor(client) ProcXTestCompareCursor(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xXTestCompareCursorReq); REQUEST(xXTestCompareCursorReq);
xXTestCompareCursorReply rep; xXTestCompareCursorReply rep;
@ -143,8 +141,7 @@ ProcXTestCompareCursor(client)
} }
static int static int
ProcXTestFakeInput(client) ProcXTestFakeInput(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xXTestFakeInputReq); REQUEST(xXTestFakeInputReq);
int nev, n, type, rc; int nev, n, type, rc;
@ -402,8 +399,7 @@ ProcXTestFakeInput(client)
} }
static int static int
ProcXTestGrabControl(client) ProcXTestGrabControl(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xXTestGrabControlReq); REQUEST(xXTestGrabControlReq);
@ -421,8 +417,7 @@ ProcXTestGrabControl(client)
} }
static int static int
ProcXTestDispatch (client) ProcXTestDispatch (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xReq); REQUEST(xReq);
switch (stuff->data) switch (stuff->data)
@ -441,8 +436,7 @@ ProcXTestDispatch (client)
} }
static int static int
SProcXTestGetVersion(client) SProcXTestGetVersion(ClientPtr client)
ClientPtr client;
{ {
int n; int n;
REQUEST(xXTestGetVersionReq); REQUEST(xXTestGetVersionReq);
@ -454,8 +448,7 @@ SProcXTestGetVersion(client)
} }
static int static int
SProcXTestCompareCursor(client) SProcXTestCompareCursor(ClientPtr client)
ClientPtr client;
{ {
int n; int n;
REQUEST(xXTestCompareCursorReq); REQUEST(xXTestCompareCursorReq);
@ -468,9 +461,7 @@ SProcXTestCompareCursor(client)
} }
static int static int
XTestSwapFakeInput(client, req) XTestSwapFakeInput(ClientPtr client, xReq *req)
ClientPtr client;
xReq *req;
{ {
int nev; int nev;
xEvent *ev; xEvent *ev;
@ -494,8 +485,7 @@ XTestSwapFakeInput(client, req)
} }
static int static int
SProcXTestFakeInput(client) SProcXTestFakeInput(ClientPtr client)
ClientPtr client;
{ {
int n; int n;
REQUEST(xReq); REQUEST(xReq);
@ -508,8 +498,7 @@ SProcXTestFakeInput(client)
} }
static int static int
SProcXTestGrabControl(client) SProcXTestGrabControl(ClientPtr client)
ClientPtr client;
{ {
int n; int n;
REQUEST(xXTestGrabControlReq); REQUEST(xXTestGrabControlReq);
@ -520,8 +509,7 @@ SProcXTestGrabControl(client)
} }
static int static int
SProcXTestDispatch (client) SProcXTestDispatch (ClientPtr client)
ClientPtr client;
{ {
REQUEST(xReq); REQUEST(xReq);
switch (stuff->data) switch (stuff->data)

7
Xext/xvmain.c
View File

@ -520,12 +520,7 @@ XvdiDestroyEncoding(pointer value, XID id)
} }
static int static int
XvdiSendVideoNotify(pPort, pDraw, reason) XvdiSendVideoNotify(XvPortPtr pPort, DrawablePtr pDraw, int reason)
XvPortPtr pPort;
DrawablePtr pDraw;
int reason;
{ {
xvEvent event; xvEvent event;
XvVideoNotifyPtr pn; XvVideoNotifyPtr pn;