Xext: sync: drop swapping request length fields

The request struct's length fields aren't used anymore - we have the
client->req_len field instead, which also is bigreq-compatible.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1639>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-07 13:54:37 +02:00 committed by Marge Bot
parent 75544f1f58
commit bf6d132df6

View File

@ -2154,20 +2154,12 @@ ProcSyncDispatch(ClientPtr client)
static int _X_COLD static int _X_COLD
SProcSyncInitialize(ClientPtr client) SProcSyncInitialize(ClientPtr client)
{ {
REQUEST(xSyncInitializeReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xSyncInitializeReq);
return ProcSyncInitialize(client); return ProcSyncInitialize(client);
} }
static int _X_COLD static int _X_COLD
SProcSyncListSystemCounters(ClientPtr client) SProcSyncListSystemCounters(ClientPtr client)
{ {
REQUEST(xSyncListSystemCountersReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xSyncListSystemCountersReq);
return ProcSyncListSystemCounters(client); return ProcSyncListSystemCounters(client);
} }
@ -2175,7 +2167,6 @@ static int _X_COLD
SProcSyncCreateCounter(ClientPtr client) SProcSyncCreateCounter(ClientPtr client)
{ {
REQUEST(xSyncCreateCounterReq); REQUEST(xSyncCreateCounterReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xSyncCreateCounterReq); REQUEST_SIZE_MATCH(xSyncCreateCounterReq);
swapl(&stuff->cid); swapl(&stuff->cid);
swapl(&stuff->initial_value_lo); swapl(&stuff->initial_value_lo);
@ -2188,7 +2179,6 @@ static int _X_COLD
SProcSyncSetCounter(ClientPtr client) SProcSyncSetCounter(ClientPtr client)
{ {
REQUEST(xSyncSetCounterReq); REQUEST(xSyncSetCounterReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xSyncSetCounterReq); REQUEST_SIZE_MATCH(xSyncSetCounterReq);
swapl(&stuff->cid); swapl(&stuff->cid);
swapl(&stuff->value_lo); swapl(&stuff->value_lo);
@ -2201,7 +2191,6 @@ static int _X_COLD
SProcSyncChangeCounter(ClientPtr client) SProcSyncChangeCounter(ClientPtr client)
{ {
REQUEST(xSyncChangeCounterReq); REQUEST(xSyncChangeCounterReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xSyncChangeCounterReq); REQUEST_SIZE_MATCH(xSyncChangeCounterReq);
swapl(&stuff->cid); swapl(&stuff->cid);
swapl(&stuff->value_lo); swapl(&stuff->value_lo);
@ -2214,7 +2203,6 @@ static int _X_COLD
SProcSyncQueryCounter(ClientPtr client) SProcSyncQueryCounter(ClientPtr client)
{ {
REQUEST(xSyncQueryCounterReq); REQUEST(xSyncQueryCounterReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xSyncQueryCounterReq); REQUEST_SIZE_MATCH(xSyncQueryCounterReq);
swapl(&stuff->counter); swapl(&stuff->counter);
@ -2225,7 +2213,6 @@ static int _X_COLD
SProcSyncDestroyCounter(ClientPtr client) SProcSyncDestroyCounter(ClientPtr client)
{ {
REQUEST(xSyncDestroyCounterReq); REQUEST(xSyncDestroyCounterReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xSyncDestroyCounterReq); REQUEST_SIZE_MATCH(xSyncDestroyCounterReq);
swapl(&stuff->counter); swapl(&stuff->counter);
@ -2236,7 +2223,6 @@ static int _X_COLD
SProcSyncAwait(ClientPtr client) SProcSyncAwait(ClientPtr client)
{ {
REQUEST(xSyncAwaitReq); REQUEST(xSyncAwaitReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xSyncAwaitReq); REQUEST_AT_LEAST_SIZE(xSyncAwaitReq);
SwapRestL(stuff); SwapRestL(stuff);
@ -2247,7 +2233,6 @@ static int _X_COLD
SProcSyncCreateAlarm(ClientPtr client) SProcSyncCreateAlarm(ClientPtr client)
{ {
REQUEST(xSyncCreateAlarmReq); REQUEST(xSyncCreateAlarmReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xSyncCreateAlarmReq); REQUEST_AT_LEAST_SIZE(xSyncCreateAlarmReq);
swapl(&stuff->id); swapl(&stuff->id);
swapl(&stuff->valueMask); swapl(&stuff->valueMask);
@ -2260,7 +2245,6 @@ static int _X_COLD
SProcSyncChangeAlarm(ClientPtr client) SProcSyncChangeAlarm(ClientPtr client)
{ {
REQUEST(xSyncChangeAlarmReq); REQUEST(xSyncChangeAlarmReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xSyncChangeAlarmReq); REQUEST_AT_LEAST_SIZE(xSyncChangeAlarmReq);
swapl(&stuff->alarm); swapl(&stuff->alarm);
swapl(&stuff->valueMask); swapl(&stuff->valueMask);
@ -2272,7 +2256,6 @@ static int _X_COLD
SProcSyncQueryAlarm(ClientPtr client) SProcSyncQueryAlarm(ClientPtr client)
{ {
REQUEST(xSyncQueryAlarmReq); REQUEST(xSyncQueryAlarmReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xSyncQueryAlarmReq); REQUEST_SIZE_MATCH(xSyncQueryAlarmReq);
swapl(&stuff->alarm); swapl(&stuff->alarm);
@ -2283,7 +2266,6 @@ static int _X_COLD
SProcSyncDestroyAlarm(ClientPtr client) SProcSyncDestroyAlarm(ClientPtr client)
{ {
REQUEST(xSyncDestroyAlarmReq); REQUEST(xSyncDestroyAlarmReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xSyncDestroyAlarmReq); REQUEST_SIZE_MATCH(xSyncDestroyAlarmReq);
swapl(&stuff->alarm); swapl(&stuff->alarm);
@ -2294,7 +2276,6 @@ static int _X_COLD
SProcSyncSetPriority(ClientPtr client) SProcSyncSetPriority(ClientPtr client)
{ {
REQUEST(xSyncSetPriorityReq); REQUEST(xSyncSetPriorityReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xSyncSetPriorityReq); REQUEST_SIZE_MATCH(xSyncSetPriorityReq);
swapl(&stuff->id); swapl(&stuff->id);
swapl(&stuff->priority); swapl(&stuff->priority);
@ -2306,7 +2287,6 @@ static int _X_COLD
SProcSyncGetPriority(ClientPtr client) SProcSyncGetPriority(ClientPtr client)
{ {
REQUEST(xSyncGetPriorityReq); REQUEST(xSyncGetPriorityReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xSyncGetPriorityReq); REQUEST_SIZE_MATCH(xSyncGetPriorityReq);
swapl(&stuff->id); swapl(&stuff->id);
@ -2317,7 +2297,6 @@ static int _X_COLD
SProcSyncCreateFence(ClientPtr client) SProcSyncCreateFence(ClientPtr client)
{ {
REQUEST(xSyncCreateFenceReq); REQUEST(xSyncCreateFenceReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xSyncCreateFenceReq); REQUEST_SIZE_MATCH(xSyncCreateFenceReq);
swapl(&stuff->d); swapl(&stuff->d);
swapl(&stuff->fid); swapl(&stuff->fid);
@ -2329,7 +2308,6 @@ static int _X_COLD
SProcSyncTriggerFence(ClientPtr client) SProcSyncTriggerFence(ClientPtr client)
{ {
REQUEST(xSyncTriggerFenceReq); REQUEST(xSyncTriggerFenceReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xSyncTriggerFenceReq); REQUEST_SIZE_MATCH(xSyncTriggerFenceReq);
swapl(&stuff->fid); swapl(&stuff->fid);
@ -2340,7 +2318,6 @@ static int _X_COLD
SProcSyncResetFence(ClientPtr client) SProcSyncResetFence(ClientPtr client)
{ {
REQUEST(xSyncResetFenceReq); REQUEST(xSyncResetFenceReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xSyncResetFenceReq); REQUEST_SIZE_MATCH(xSyncResetFenceReq);
swapl(&stuff->fid); swapl(&stuff->fid);
@ -2351,7 +2328,6 @@ static int _X_COLD
SProcSyncDestroyFence(ClientPtr client) SProcSyncDestroyFence(ClientPtr client)
{ {
REQUEST(xSyncDestroyFenceReq); REQUEST(xSyncDestroyFenceReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xSyncDestroyFenceReq); REQUEST_SIZE_MATCH(xSyncDestroyFenceReq);
swapl(&stuff->fid); swapl(&stuff->fid);
@ -2362,7 +2338,6 @@ static int _X_COLD
SProcSyncQueryFence(ClientPtr client) SProcSyncQueryFence(ClientPtr client)
{ {
REQUEST(xSyncQueryFenceReq); REQUEST(xSyncQueryFenceReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xSyncQueryFenceReq); REQUEST_SIZE_MATCH(xSyncQueryFenceReq);
swapl(&stuff->fid); swapl(&stuff->fid);
@ -2373,7 +2348,6 @@ static int _X_COLD
SProcSyncAwaitFence(ClientPtr client) SProcSyncAwaitFence(ClientPtr client)
{ {
REQUEST(xSyncAwaitFenceReq); REQUEST(xSyncAwaitFenceReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xSyncAwaitFenceReq); REQUEST_AT_LEAST_SIZE(xSyncAwaitFenceReq);
SwapRestL(stuff); SwapRestL(stuff);