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

xsync: ANSI cleanups

This commit is contained in:
Adam Jackson 2008-12-10 14:18:59 -05:00
parent e0d8f6a808
commit 1a99110f0c
1 changed files with 138 additions and 392 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

396
Xext/sync.c
View File

@ -97,173 +97,11 @@ static SyncCounter **SysCounterList = NULL;
#define XSyncCAAllTrigger \ #define XSyncCAAllTrigger \
(XSyncCACounter | XSyncCAValueType | XSyncCAValue | XSyncCATestType) (XSyncCACounter | XSyncCAValueType | XSyncCAValue | XSyncCATestType)
static int static void SyncComputeBracketValues(SyncCounter *, Bool);
FreeAlarm(
pointer /* addr */,
XID /* id */
);
static int static void SyncInitServerTime(void);
FreeAlarmClient(
pointer /* value */,
XID /* id */
);
static int static void SyncInitIdleTime(void);
FreeAwait(
pointer /* addr */,
XID /* id */
);
static void
ServertimeBracketValues(
pointer /* pCounter */,
CARD64 * /* pbracket_less */,
CARD64 * /* pbracket_greater */
);
static void
ServertimeQueryValue(
pointer /* pCounter */,
CARD64 * /* pValue_return */
);
static void
ServertimeWakeupHandler(
pointer /* env */,
int /* rc */,
pointer /* LastSelectMask */
);
static int
SyncInitTrigger(
ClientPtr /* client */,
SyncTrigger * /* pTrigger */,
XSyncCounter /* counter */,
Mask /* changes */
);
static void
SAlarmNotifyEvent(
xSyncAlarmNotifyEvent * /* from */,
xSyncAlarmNotifyEvent * /* to */
);
static void
SCounterNotifyEvent(
xSyncCounterNotifyEvent * /* from */,
xSyncCounterNotifyEvent * /* to */
);
static void
ServertimeBlockHandler(
pointer /* env */,
struct timeval ** /* wt */,
pointer /* LastSelectMask */
);
static int
SyncAddTriggerToCounter(
SyncTrigger * /* pTrigger */
);
extern void
SyncAlarmCounterDestroyed(
SyncTrigger * /* pTrigger */
);
static void
SyncAlarmTriggerFired(
SyncTrigger * /* pTrigger */
);
static void
SyncAwaitTriggerFired(
SyncTrigger * /* pTrigger */
);
static int
SyncChangeAlarmAttributes(
ClientPtr /* client */,
SyncAlarm * /* pAlarm */,
Mask /* mask */,
CARD32 * /* values */
);
static Bool
SyncCheckTriggerNegativeComparison(
SyncTrigger * /* pTrigger */,
CARD64 /* oldval */
);
static Bool
SyncCheckTriggerNegativeTransition(
SyncTrigger * /* pTrigger */,
CARD64 /* oldval */
);
static Bool
SyncCheckTriggerPositiveComparison(
SyncTrigger * /* pTrigger */,
CARD64 /* oldval */
);
static Bool
SyncCheckTriggerPositiveTransition(
SyncTrigger * /* pTrigger */,
CARD64 /* oldval */
);
static SyncCounter *
SyncCreateCounter(
ClientPtr /* client */,
XSyncCounter /* id */,
CARD64 /* initialvalue */
);
static void SyncComputeBracketValues(
SyncCounter * /* pCounter */,
Bool /* startOver */
);
static void
SyncDeleteTriggerFromCounter(
SyncTrigger * /* pTrigger */
);
static Bool
SyncEventSelectForAlarm(
SyncAlarm * /* pAlarm */,
ClientPtr /* client */,
Bool /* wantevents */
);
static void
SyncInitServerTime(
void
);
static void
SyncInitIdleTime(
void
);
static void
SyncResetProc(
ExtensionEntry * /* extEntry */
);
static void
SyncSendAlarmNotifyEvents(
SyncAlarm * /* pAlarm */
);
static void
SyncSendCounterNotifyEvents(
ClientPtr /* client */,
SyncAwait ** /* ppAwait */,
int /* num_events */
);
static DISPATCH_PROC(ProcSyncAwait); static DISPATCH_PROC(ProcSyncAwait);
static DISPATCH_PROC(ProcSyncChangeAlarm); static DISPATCH_PROC(ProcSyncChangeAlarm);
@ -301,8 +139,7 @@ static DISPATCH_PROC(SProcSyncSetPriority);
* delete and add triggers on this list. * delete and add triggers on this list.
*/ */
static void static void
SyncDeleteTriggerFromCounter(pTrigger) SyncDeleteTriggerFromCounter(SyncTrigger *pTrigger)
SyncTrigger *pTrigger;
{ {
SyncTriggerList *pCur; SyncTriggerList *pCur;
SyncTriggerList *pPrev; SyncTriggerList *pPrev;
@ -338,8 +175,7 @@ SyncDeleteTriggerFromCounter(pTrigger)
static int static int
SyncAddTriggerToCounter(pTrigger) SyncAddTriggerToCounter(SyncTrigger *pTrigger)
SyncTrigger *pTrigger;
{ {
SyncTriggerList *pCur; SyncTriggerList *pCur;
@ -382,9 +218,7 @@ SyncAddTriggerToCounter(pTrigger)
*/ */
static Bool static Bool
SyncCheckTriggerPositiveComparison(pTrigger, oldval) SyncCheckTriggerPositiveComparison(SyncTrigger *pTrigger, CARD64 oldval)
SyncTrigger *pTrigger;
CARD64 oldval;
{ {
return (pTrigger->pCounter == NULL || return (pTrigger->pCounter == NULL ||
XSyncValueGreaterOrEqual(pTrigger->pCounter->value, XSyncValueGreaterOrEqual(pTrigger->pCounter->value,
@ -392,9 +226,7 @@ SyncCheckTriggerPositiveComparison(pTrigger, oldval)
} }
static Bool static Bool
SyncCheckTriggerNegativeComparison(pTrigger, oldval) SyncCheckTriggerNegativeComparison(SyncTrigger *pTrigger, CARD64 oldval)
SyncTrigger *pTrigger;
CARD64 oldval;
{ {
return (pTrigger->pCounter == NULL || return (pTrigger->pCounter == NULL ||
XSyncValueLessOrEqual(pTrigger->pCounter->value, XSyncValueLessOrEqual(pTrigger->pCounter->value,
@ -402,9 +234,7 @@ SyncCheckTriggerNegativeComparison(pTrigger, oldval)
} }
static Bool static Bool
SyncCheckTriggerPositiveTransition(pTrigger, oldval) SyncCheckTriggerPositiveTransition(SyncTrigger *pTrigger, CARD64 oldval)
SyncTrigger *pTrigger;
CARD64 oldval;
{ {
return (pTrigger->pCounter == NULL || return (pTrigger->pCounter == NULL ||
(XSyncValueLessThan(oldval, pTrigger->test_value) && (XSyncValueLessThan(oldval, pTrigger->test_value) &&
@ -413,9 +243,7 @@ SyncCheckTriggerPositiveTransition(pTrigger, oldval)
} }
static Bool static Bool
SyncCheckTriggerNegativeTransition(pTrigger, oldval) SyncCheckTriggerNegativeTransition(SyncTrigger *pTrigger, CARD64 oldval)
SyncTrigger *pTrigger;
CARD64 oldval;
{ {
return (pTrigger->pCounter == NULL || return (pTrigger->pCounter == NULL ||
(XSyncValueGreaterThan(oldval, pTrigger->test_value) && (XSyncValueGreaterThan(oldval, pTrigger->test_value) &&
@ -423,14 +251,9 @@ SyncCheckTriggerNegativeTransition(pTrigger, oldval)
pTrigger->test_value))); pTrigger->test_value)));
} }
static int static int
SyncInitTrigger(client, pTrigger, counter, changes) SyncInitTrigger(ClientPtr client, SyncTrigger pTrigger, XSyncCounter counter,
ClientPtr client; /* so we can set errorValue */ Mask changes)
SyncTrigger *pTrigger;
XSyncCounter counter;
Mask changes;
{ {
SyncCounter *pCounter = pTrigger->pCounter; SyncCounter *pCounter = pTrigger->pCounter;
int rc; int rc;
@ -542,8 +365,7 @@ SyncInitTrigger(client, pTrigger, counter, changes)
* clients. The alarm maintains a list of clients interested in events. * clients. The alarm maintains a list of clients interested in events.
*/ */
static void static void
SyncSendAlarmNotifyEvents(pAlarm) SyncSendAlarmNotifyEvents(SyncAlarm *pAlarm)
SyncAlarm *pAlarm;
{ {
SyncAlarmClientList *pcl; SyncAlarmClientList *pcl;
xSyncAlarmNotifyEvent ane; xSyncAlarmNotifyEvent ane;
@ -590,10 +412,8 @@ SyncSendAlarmNotifyEvents(pAlarm)
* go only to the Awaiting client. * go only to the Awaiting client.
*/ */
static void static void
SyncSendCounterNotifyEvents(client, ppAwait, num_events) SyncSendCounterNotifyEvents(ClientPtr client, SyncAwait **ppAwait,
ClientPtr client; int num_events)
SyncAwait **ppAwait;
int num_events;
{ {
xSyncCounterNotifyEvent *pEvents, *pev; xSyncCounterNotifyEvent *pEvents, *pev;
int i; int i;
@ -629,8 +449,7 @@ SyncSendCounterNotifyEvents(client, ppAwait, num_events)
* It is plugged into pTrigger->CounterDestroyed (for alarm triggers). * It is plugged into pTrigger->CounterDestroyed (for alarm triggers).
*/ */
void void
SyncAlarmCounterDestroyed(pTrigger) SyncAlarmCounterDestroyed(SyncTrigger *pTrigger)
SyncTrigger *pTrigger;
{ {
SyncAlarm *pAlarm = (SyncAlarm *)pTrigger; SyncAlarm *pAlarm = (SyncAlarm *)pTrigger;
@ -644,8 +463,7 @@ SyncAlarmCounterDestroyed(pTrigger)
* It is plugged into pTrigger->TriggerFired (for alarm triggers). * It is plugged into pTrigger->TriggerFired (for alarm triggers).
*/ */
static void static void
SyncAlarmTriggerFired(pTrigger) SyncAlarmTriggerFired(SyncTrigger *pTrigger)
SyncTrigger *pTrigger;
{ {
SyncAlarm *pAlarm = (SyncAlarm *)pTrigger; SyncAlarm *pAlarm = (SyncAlarm *)pTrigger;
CARD64 new_test_value; CARD64 new_test_value;
@ -720,8 +538,7 @@ SyncAlarmTriggerFired(pTrigger)
* (for Await triggers). * (for Await triggers).
*/ */
static void static void
SyncAwaitTriggerFired(pTrigger) SyncAwaitTriggerFired(SyncTrigger *pTrigger)
SyncTrigger *pTrigger;
{ {
SyncAwait *pAwait = (SyncAwait *)pTrigger; SyncAwait *pAwait = (SyncAwait *)pTrigger;
int numwaits; int numwaits;
@ -814,9 +631,7 @@ bail:
* any triggers depending on the counter will be checked. * any triggers depending on the counter will be checked.
*/ */
void void
SyncChangeCounter(pCounter, newval) SyncChangeCounter(SyncCounter *pCounter, CARD64 newval)
SyncCounter *pCounter;
CARD64 newval;
{ {
SyncTriggerList *ptl, *pnext; SyncTriggerList *ptl, *pnext;
CARD64 oldval; CARD64 oldval;
@ -841,10 +656,7 @@ SyncChangeCounter(pCounter, newval)
/* loosely based on dix/events.c/EventSelectForWindow */ /* loosely based on dix/events.c/EventSelectForWindow */
static Bool static Bool
SyncEventSelectForAlarm(pAlarm, client, wantevents) SyncEventSelectForAlarm(SyncAlarm *pAlarm, ClientPtr client, Bool wantevents)
SyncAlarm *pAlarm;
ClientPtr client;
Bool wantevents;
{ {
SyncAlarmClientList *pClients; SyncAlarmClientList *pClients;
@ -913,11 +725,8 @@ SyncEventSelectForAlarm(pAlarm, client, wantevents)
* ** SyncChangeAlarmAttributes ** This is used by CreateAlarm and ChangeAlarm * ** SyncChangeAlarmAttributes ** This is used by CreateAlarm and ChangeAlarm
*/ */
static int static int
SyncChangeAlarmAttributes(client, pAlarm, mask, values) SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm *pAlarm, Mask mask,
ClientPtr client; CARD32 *values)
SyncAlarm *pAlarm;
Mask mask;
CARD32 *values;
{ {
int status; int status;
XSyncCounter counter; XSyncCounter counter;
@ -1014,10 +823,7 @@ SyncChangeAlarmAttributes(client, pAlarm, mask, values)
static SyncCounter * static SyncCounter *
SyncCreateCounter(client, id, initialvalue) SyncCreateCounter(ClientPtr client, XSyncCounter id, CARD64 initialvalue)
ClientPtr client;
XSyncCounter id;
CARD64 initialvalue;
{ {
SyncCounter *pCounter; SyncCounter *pCounter;
@ -1039,10 +845,7 @@ SyncCreateCounter(client, id, initialvalue)
return pCounter; return pCounter;
} }
static int FreeCounter( static int FreeCounter(void *, XID);
pointer /*env*/,
XID /*id*/
);
/* /*
* ***** System Counter utilities * ***** System Counter utilities
@ -1116,9 +919,7 @@ SyncDestroySystemCounter(pSysCounter)
} }
static void static void
SyncComputeBracketValues(pCounter, startOver) SyncComputeBracketValues(SyncCounter *pCounter, Bool startOver)
SyncCounter *pCounter;
Bool startOver;
{ {
SyncTriggerList *pCur; SyncTriggerList *pCur;
SyncTrigger *pTrigger; SyncTrigger *pTrigger;
@ -1205,9 +1006,7 @@ SyncComputeBracketValues(pCounter, startOver)
/* ARGSUSED */ /* ARGSUSED */
static int static int
FreeAlarm(addr, id) FreeAlarm(void *addr, XID id)
pointer addr;
XID id;
{ {
SyncAlarm *pAlarm = (SyncAlarm *) addr; SyncAlarm *pAlarm = (SyncAlarm *) addr;
@ -1232,9 +1031,7 @@ FreeAlarm(addr, id)
*/ */
/* ARGSUSED */ /* ARGSUSED */
static int static int
FreeCounter(env, id) FreeCounter(void *env, XID id)
pointer env;
XID id;
{ {
SyncCounter *pCounter = (SyncCounter *) env; SyncCounter *pCounter = (SyncCounter *) env;
SyncTriggerList *ptl, *pnext; SyncTriggerList *ptl, *pnext;
@ -1284,9 +1081,7 @@ FreeCounter(env, id)
*/ */
/* ARGSUSED */ /* ARGSUSED */
static int static int
FreeAwait(addr, id) FreeAwait(void *addr, XID id)
pointer addr;
XID id;
{ {
SyncAwaitUnion *pAwaitUnion = (SyncAwaitUnion *) addr; SyncAwaitUnion *pAwaitUnion = (SyncAwaitUnion *) addr;
SyncAwait *pAwait; SyncAwait *pAwait;
@ -1312,9 +1107,7 @@ FreeAwait(addr, id)
/* loosely based on dix/events.c/OtherClientGone */ /* loosely based on dix/events.c/OtherClientGone */
static int static int
FreeAlarmClient(value, id) FreeAlarmClient(void *value, XID id)
pointer value; /* must conform to DeleteType */
XID id;
{ {
SyncAlarm *pAlarm = (SyncAlarm *)value; SyncAlarm *pAlarm = (SyncAlarm *)value;
SyncAlarmClientList *pCur, *pPrev; SyncAlarmClientList *pCur, *pPrev;
@ -1347,8 +1140,7 @@ FreeAlarmClient(value, id)
* ** Initialize the extension * ** Initialize the extension
*/ */
static int static int
ProcSyncInitialize(client) ProcSyncInitialize(ClientPtr client)
ClientPtr client;
{ {
xSyncInitializeReply rep; xSyncInitializeReply rep;
int n; int n;
@ -1373,8 +1165,7 @@ ProcSyncInitialize(client)
* ** Get list of system counters available through the extension * ** Get list of system counters available through the extension
*/ */
static int static int
ProcSyncListSystemCounters(client) ProcSyncListSystemCounters(ClientPtr client)
ClientPtr client;
{ {
xSyncListSystemCountersReply rep; xSyncListSystemCountersReply rep;
int i, len; int i, len;
@ -1451,8 +1242,7 @@ ProcSyncListSystemCounters(client)
* ** Set client Priority * ** Set client Priority
*/ */
static int static int
ProcSyncSetPriority(client) ProcSyncSetPriority(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncSetPriorityReq); REQUEST(xSyncSetPriorityReq);
ClientPtr priorityclient; ClientPtr priorityclient;
@ -1487,8 +1277,7 @@ ProcSyncSetPriority(client)
* ** Get client Priority * ** Get client Priority
*/ */
static int static int
ProcSyncGetPriority(client) ProcSyncGetPriority(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncGetPriorityReq); REQUEST(xSyncGetPriorityReq);
xSyncGetPriorityReply rep; xSyncGetPriorityReply rep;
@ -1527,8 +1316,7 @@ ProcSyncGetPriority(client)
* ** Create a new counter * ** Create a new counter
*/ */
static int static int
ProcSyncCreateCounter(client) ProcSyncCreateCounter(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncCreateCounterReq); REQUEST(xSyncCreateCounterReq);
CARD64 initial; CARD64 initial;
@ -1548,8 +1336,7 @@ ProcSyncCreateCounter(client)
* ** Set Counter value * ** Set Counter value
*/ */
static int static int
ProcSyncSetCounter(client) ProcSyncSetCounter(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncSetCounterReq); REQUEST(xSyncSetCounterReq);
SyncCounter *pCounter; SyncCounter *pCounter;
@ -1580,8 +1367,7 @@ ProcSyncSetCounter(client)
* ** Change Counter value * ** Change Counter value
*/ */
static int static int
ProcSyncChangeCounter(client) ProcSyncChangeCounter(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncChangeCounterReq); REQUEST(xSyncChangeCounterReq);
SyncCounter *pCounter; SyncCounter *pCounter;
@ -1620,8 +1406,7 @@ ProcSyncChangeCounter(client)
* ** Destroy a counter * ** Destroy a counter
*/ */
static int static int
ProcSyncDestroyCounter(client) ProcSyncDestroyCounter(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncDestroyCounterReq); REQUEST(xSyncDestroyCounterReq);
SyncCounter *pCounter; SyncCounter *pCounter;
@ -1649,8 +1434,7 @@ ProcSyncDestroyCounter(client)
* ** Await * ** Await
*/ */
static int static int
ProcSyncAwait(client) ProcSyncAwait(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncAwaitReq); REQUEST(xSyncAwaitReq);
int len, items; int len, items;
@ -1765,8 +1549,7 @@ ProcSyncAwait(client)
* ** Query a counter * ** Query a counter
*/ */
static int static int
ProcSyncQueryCounter(client) ProcSyncQueryCounter(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncQueryCounterReq); REQUEST(xSyncQueryCounterReq);
xSyncQueryCounterReply rep; xSyncQueryCounterReply rep;
@ -1813,8 +1596,7 @@ ProcSyncQueryCounter(client)
* ** Create Alarm * ** Create Alarm
*/ */
static int static int
ProcSyncCreateAlarm(client) ProcSyncCreateAlarm(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncCreateAlarmReq); REQUEST(xSyncCreateAlarmReq);
SyncAlarm *pAlarm; SyncAlarm *pAlarm;
@ -1893,8 +1675,7 @@ ProcSyncCreateAlarm(client)
* ** Change Alarm * ** Change Alarm
*/ */
static int static int
ProcSyncChangeAlarm(client) ProcSyncChangeAlarm(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncChangeAlarmReq); REQUEST(xSyncChangeAlarmReq);
SyncAlarm *pAlarm; SyncAlarm *pAlarm;
@ -1934,8 +1715,7 @@ ProcSyncChangeAlarm(client)
} }
static int static int
ProcSyncQueryAlarm(client) ProcSyncQueryAlarm(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncQueryAlarmReq); REQUEST(xSyncQueryAlarmReq);
SyncAlarm *pAlarm; SyncAlarm *pAlarm;
@ -1995,10 +1775,8 @@ ProcSyncQueryAlarm(client)
return client->noClientException; return client->noClientException;
} }
static int static int
ProcSyncDestroyAlarm(client) ProcSyncDestroyAlarm(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncDestroyAlarmReq); REQUEST(xSyncDestroyAlarmReq);
@ -2019,14 +1797,12 @@ ProcSyncDestroyAlarm(client)
* ** Given an extension request, call the appropriate request procedure * ** Given an extension request, call the appropriate request procedure
*/ */
static int static int
ProcSyncDispatch(client) ProcSyncDispatch(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xReq); REQUEST(xReq);
switch (stuff->data) switch (stuff->data)
{ {
case X_SyncInitialize: case X_SyncInitialize:
return ProcSyncInitialize(client); return ProcSyncInitialize(client);
case X_SyncListSystemCounters: case X_SyncListSystemCounters:
@ -2065,8 +1841,7 @@ ProcSyncDispatch(client)
*/ */
static int static int
SProcSyncInitialize(client) SProcSyncInitialize(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncInitializeReq); REQUEST(xSyncInitializeReq);
char n; char n;
@ -2078,8 +1853,7 @@ SProcSyncInitialize(client)
} }
static int static int
SProcSyncListSystemCounters(client) SProcSyncListSystemCounters(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncListSystemCountersReq); REQUEST(xSyncListSystemCountersReq);
char n; char n;
@ -2091,8 +1865,7 @@ SProcSyncListSystemCounters(client)
} }
static int static int
SProcSyncCreateCounter(client) SProcSyncCreateCounter(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncCreateCounterReq); REQUEST(xSyncCreateCounterReq);
char n; char n;
@ -2107,8 +1880,7 @@ SProcSyncCreateCounter(client)
} }
static int static int
SProcSyncSetCounter(client) SProcSyncSetCounter(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncSetCounterReq); REQUEST(xSyncSetCounterReq);
char n; char n;
@ -2123,8 +1895,7 @@ SProcSyncSetCounter(client)
} }
static int static int
SProcSyncChangeCounter(client) SProcSyncChangeCounter(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncChangeCounterReq); REQUEST(xSyncChangeCounterReq);
char n; char n;
@ -2139,8 +1910,7 @@ SProcSyncChangeCounter(client)
} }
static int static int
SProcSyncQueryCounter(client) SProcSyncQueryCounter(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncQueryCounterReq); REQUEST(xSyncQueryCounterReq);
char n; char n;
@ -2153,8 +1923,7 @@ SProcSyncQueryCounter(client)
} }
static int static int
SProcSyncDestroyCounter(client) SProcSyncDestroyCounter(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncDestroyCounterReq); REQUEST(xSyncDestroyCounterReq);
char n; char n;
@ -2167,8 +1936,7 @@ SProcSyncDestroyCounter(client)
} }
static int static int
SProcSyncAwait(client) SProcSyncAwait(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncAwaitReq); REQUEST(xSyncAwaitReq);
char n; char n;
@ -2180,10 +1948,8 @@ SProcSyncAwait(client)
return ProcSyncAwait(client); return ProcSyncAwait(client);
} }
static int static int
SProcSyncCreateAlarm(client) SProcSyncCreateAlarm(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncCreateAlarmReq); REQUEST(xSyncCreateAlarmReq);
char n; char n;
@ -2198,8 +1964,7 @@ SProcSyncCreateAlarm(client)
} }
static int static int
SProcSyncChangeAlarm(client) SProcSyncChangeAlarm(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncChangeAlarmReq); REQUEST(xSyncChangeAlarmReq);
char n; char n;
@ -2213,8 +1978,7 @@ SProcSyncChangeAlarm(client)
} }
static int static int
SProcSyncQueryAlarm(client) SProcSyncQueryAlarm(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncQueryAlarmReq); REQUEST(xSyncQueryAlarmReq);
char n; char n;
@ -2227,8 +1991,7 @@ SProcSyncQueryAlarm(client)
} }
static int static int
SProcSyncDestroyAlarm(client) SProcSyncDestroyAlarm(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncDestroyAlarmReq); REQUEST(xSyncDestroyAlarmReq);
char n; char n;
@ -2241,8 +2004,7 @@ SProcSyncDestroyAlarm(client)
} }
static int static int
SProcSyncSetPriority(client) SProcSyncSetPriority(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncSetPriorityReq); REQUEST(xSyncSetPriorityReq);
char n; char n;
@ -2256,8 +2018,7 @@ SProcSyncSetPriority(client)
} }
static int static int
SProcSyncGetPriority(client) SProcSyncGetPriority(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xSyncGetPriorityReq); REQUEST(xSyncGetPriorityReq);
char n; char n;
@ -2271,8 +2032,7 @@ SProcSyncGetPriority(client)
static int static int
SProcSyncDispatch(client) SProcSyncDispatch(ClientPtr client)
ClientPtr client;
{ {
REQUEST(xReq); REQUEST(xReq);
@ -2316,8 +2076,7 @@ SProcSyncDispatch(client)
*/ */
static void static void
SCounterNotifyEvent(from, to) SCounterNotifyEvent(xSyncCounterNotifyEvent *from, xSyncCounterNotifyEvent *to)
xSyncCounterNotifyEvent *from, *to;
{ {
to->type = from->type; to->type = from->type;
to->kind = from->kind; to->kind = from->kind;
@ -2334,8 +2093,7 @@ SCounterNotifyEvent(from, to)
static void static void
SAlarmNotifyEvent(from, to) SAlarmNotifyEvent(xSyncAlarmNotifyEvent *from, xSyncAlarmNotifyEvent *to)
xSyncAlarmNotifyEvent *from, *to;
{ {
to->type = from->type; to->type = from->type;
to->kind = from->kind; to->kind = from->kind;
@ -2354,8 +2112,7 @@ SAlarmNotifyEvent(from, to)
*/ */
/* ARGSUSED */ /* ARGSUSED */
static void static void
SyncResetProc(extEntry) SyncResetProc(ExtensionEntry *extEntry)
ExtensionEntry *extEntry;
{ {
xfree(SysCounterList); xfree(SysCounterList);
SysCounterList = NULL; SysCounterList = NULL;
@ -2367,7 +2124,7 @@ SyncResetProc(extEntry)
* ** Initialise the extension. * ** Initialise the extension.
*/ */
void void
SyncExtensionInit(INITARGS) SyncExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
@ -2436,10 +2193,8 @@ static XSyncValue *pnext_time;
*** code inspired by multibuffer extension *** code inspired by multibuffer extension
*/ */
/*ARGSUSED*/ /*ARGSUSED*/
static void ServertimeBlockHandler(env, wt, LastSelectMask) static void
pointer env; ServertimeBlockHandler(void *env, struct timeval **wt, void *LastSelectMask)
struct timeval **wt;
pointer LastSelectMask;
{ {
XSyncValue delay; XSyncValue delay;
unsigned long timeout; unsigned long timeout;
@ -2467,10 +2222,8 @@ pointer LastSelectMask;
*** Wakeup Handler *** Wakeup Handler
*/ */
/*ARGSUSED*/ /*ARGSUSED*/
static void ServertimeWakeupHandler(env, rc, LastSelectMask) static void
pointer env; ServertimeWakeupHandler(void *env, int rc, void *LastSelectMask)
int rc;
pointer LastSelectMask;
{ {
if (pnext_time) if (pnext_time)
{ {
@ -2484,19 +2237,15 @@ pointer LastSelectMask;
} }
static void static void
ServertimeQueryValue(pCounter, pValue_return) ServertimeQueryValue(void *pCounter, CARD64 *pValue_return)
pointer pCounter;
CARD64 *pValue_return;
{ {
GetTime(); GetTime();
*pValue_return = Now; *pValue_return = Now;
} }
static void static void
ServertimeBracketValues(pCounter, pbracket_less, pbracket_greater) ServertimeBracketValues(void *pCounter, CARD64 *pbracket_less,
pointer pCounter; CARD64 *pbracket_greater)
CARD64 *pbracket_less;
CARD64 *pbracket_greater;
{ {
if (!pnext_time && pbracket_greater) if (!pnext_time && pbracket_greater)
{ {
@ -2579,9 +2328,7 @@ IdleTimeBlockHandler (pointer env,
} }
static void static void
IdleTimeWakeupHandler (pointer env, IdleTimeWakeupHandler (pointer env, int rc, pointer LastSelectMask)
int rc,
pointer LastSelectMask)
{ {
XSyncValue idle; XSyncValue idle;
@ -2600,8 +2347,7 @@ IdleTimeWakeupHandler (pointer env,
} }
static void static void
IdleTimeBracketValues (pointer pCounter, IdleTimeBracketValues (pointer pCounter, CARD64 *pbracket_less,
CARD64 *pbracket_less,
CARD64 *pbracket_greater) CARD64 *pbracket_greater)
{ {
Bool registered = (pIdleTimeValueLess || pIdleTimeValueGreater); Bool registered = (pIdleTimeValueLess || pIdleTimeValueGreater);