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

(submit/fixup-req-len) xkb: 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>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-06 14:29:26 +02:00
parent 0d2f23566f
commit a93296c87e
1 changed files with 0 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
xkb/xkbSwap.c
View File

@ -45,8 +45,6 @@ static int _X_COLD
SProcXkbUseExtension(ClientPtr client) SProcXkbUseExtension(ClientPtr client)
{ {
REQUEST(xkbUseExtensionReq); REQUEST(xkbUseExtensionReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xkbUseExtensionReq); REQUEST_SIZE_MATCH(xkbUseExtensionReq);
swaps(&stuff->wantedMajor); swaps(&stuff->wantedMajor);
swaps(&stuff->wantedMinor); swaps(&stuff->wantedMinor);
@ -57,8 +55,6 @@ static int _X_COLD
SProcXkbSelectEvents(ClientPtr client) SProcXkbSelectEvents(ClientPtr client)
{ {
REQUEST(xkbSelectEventsReq); REQUEST(xkbSelectEventsReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xkbSelectEventsReq); REQUEST_AT_LEAST_SIZE(xkbSelectEventsReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swaps(&stuff->affectWhich); swaps(&stuff->affectWhich);
@ -135,8 +131,6 @@ static int _X_COLD
SProcXkbBell(ClientPtr client) SProcXkbBell(ClientPtr client)
{ {
REQUEST(xkbBellReq); REQUEST(xkbBellReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xkbBellReq); REQUEST_SIZE_MATCH(xkbBellReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swaps(&stuff->bellClass); swaps(&stuff->bellClass);
@ -152,8 +146,6 @@ static int _X_COLD
SProcXkbGetState(ClientPtr client) SProcXkbGetState(ClientPtr client)
{ {
REQUEST(xkbGetStateReq); REQUEST(xkbGetStateReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xkbGetStateReq); REQUEST_SIZE_MATCH(xkbGetStateReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
return ProcXkbGetState(client); return ProcXkbGetState(client);
@ -163,8 +155,6 @@ static int _X_COLD
SProcXkbLatchLockState(ClientPtr client) SProcXkbLatchLockState(ClientPtr client)
{ {
REQUEST(xkbLatchLockStateReq); REQUEST(xkbLatchLockStateReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xkbLatchLockStateReq); REQUEST_SIZE_MATCH(xkbLatchLockStateReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swaps(&stuff->groupLatch); swaps(&stuff->groupLatch);
@ -175,8 +165,6 @@ static int _X_COLD
SProcXkbGetControls(ClientPtr client) SProcXkbGetControls(ClientPtr client)
{ {
REQUEST(xkbGetControlsReq); REQUEST(xkbGetControlsReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xkbGetControlsReq); REQUEST_SIZE_MATCH(xkbGetControlsReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
return ProcXkbGetControls(client); return ProcXkbGetControls(client);
@ -186,8 +174,6 @@ static int _X_COLD
SProcXkbSetControls(ClientPtr client) SProcXkbSetControls(ClientPtr client)
{ {
REQUEST(xkbSetControlsReq); REQUEST(xkbSetControlsReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xkbSetControlsReq); REQUEST_SIZE_MATCH(xkbSetControlsReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swaps(&stuff->affectInternalVMods); swaps(&stuff->affectInternalVMods);
@ -219,8 +205,6 @@ static int _X_COLD
SProcXkbGetMap(ClientPtr client) SProcXkbGetMap(ClientPtr client)
{ {
REQUEST(xkbGetMapReq); REQUEST(xkbGetMapReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xkbGetMapReq); REQUEST_SIZE_MATCH(xkbGetMapReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swaps(&stuff->full); swaps(&stuff->full);
@ -233,8 +217,6 @@ static int _X_COLD
SProcXkbSetMap(ClientPtr client) SProcXkbSetMap(ClientPtr client)
{ {
REQUEST(xkbSetMapReq); REQUEST(xkbSetMapReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xkbSetMapReq); REQUEST_AT_LEAST_SIZE(xkbSetMapReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swaps(&stuff->present); swaps(&stuff->present);
@ -249,8 +231,6 @@ static int _X_COLD
SProcXkbGetCompatMap(ClientPtr client) SProcXkbGetCompatMap(ClientPtr client)
{ {
REQUEST(xkbGetCompatMapReq); REQUEST(xkbGetCompatMapReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xkbGetCompatMapReq); REQUEST_SIZE_MATCH(xkbGetCompatMapReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swaps(&stuff->firstSI); swaps(&stuff->firstSI);
@ -262,8 +242,6 @@ static int _X_COLD
SProcXkbSetCompatMap(ClientPtr client) SProcXkbSetCompatMap(ClientPtr client)
{ {
REQUEST(xkbSetCompatMapReq); REQUEST(xkbSetCompatMapReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xkbSetCompatMapReq); REQUEST_AT_LEAST_SIZE(xkbSetCompatMapReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swaps(&stuff->firstSI); swaps(&stuff->firstSI);
@ -275,8 +253,6 @@ static int _X_COLD
SProcXkbGetIndicatorState(ClientPtr client) SProcXkbGetIndicatorState(ClientPtr client)
{ {
REQUEST(xkbGetIndicatorStateReq); REQUEST(xkbGetIndicatorStateReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xkbGetIndicatorStateReq); REQUEST_SIZE_MATCH(xkbGetIndicatorStateReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
return ProcXkbGetIndicatorState(client); return ProcXkbGetIndicatorState(client);
@ -286,8 +262,6 @@ static int _X_COLD
SProcXkbGetIndicatorMap(ClientPtr client) SProcXkbGetIndicatorMap(ClientPtr client)
{ {
REQUEST(xkbGetIndicatorMapReq); REQUEST(xkbGetIndicatorMapReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xkbGetIndicatorMapReq); REQUEST_SIZE_MATCH(xkbGetIndicatorMapReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swapl(&stuff->which); swapl(&stuff->which);
@ -298,8 +272,6 @@ static int _X_COLD
SProcXkbSetIndicatorMap(ClientPtr client) SProcXkbSetIndicatorMap(ClientPtr client)
{ {
REQUEST(xkbSetIndicatorMapReq); REQUEST(xkbSetIndicatorMapReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xkbSetIndicatorMapReq); REQUEST_AT_LEAST_SIZE(xkbSetIndicatorMapReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swapl(&stuff->which); swapl(&stuff->which);
@ -310,8 +282,6 @@ static int _X_COLD
SProcXkbGetNamedIndicator(ClientPtr client) SProcXkbGetNamedIndicator(ClientPtr client)
{ {
REQUEST(xkbGetNamedIndicatorReq); REQUEST(xkbGetNamedIndicatorReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xkbGetNamedIndicatorReq); REQUEST_SIZE_MATCH(xkbGetNamedIndicatorReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swaps(&stuff->ledClass); swaps(&stuff->ledClass);
@ -324,8 +294,6 @@ static int _X_COLD
SProcXkbSetNamedIndicator(ClientPtr client) SProcXkbSetNamedIndicator(ClientPtr client)
{ {
REQUEST(xkbSetNamedIndicatorReq); REQUEST(xkbSetNamedIndicatorReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xkbSetNamedIndicatorReq); REQUEST_SIZE_MATCH(xkbSetNamedIndicatorReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swaps(&stuff->ledClass); swaps(&stuff->ledClass);
@ -340,8 +308,6 @@ static int _X_COLD
SProcXkbGetNames(ClientPtr client) SProcXkbGetNames(ClientPtr client)
{ {
REQUEST(xkbGetNamesReq); REQUEST(xkbGetNamesReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xkbGetNamesReq); REQUEST_SIZE_MATCH(xkbGetNamesReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swapl(&stuff->which); swapl(&stuff->which);
@ -352,8 +318,6 @@ static int _X_COLD
SProcXkbSetNames(ClientPtr client) SProcXkbSetNames(ClientPtr client)
{ {
REQUEST(xkbSetNamesReq); REQUEST(xkbSetNamesReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xkbSetNamesReq); REQUEST_AT_LEAST_SIZE(xkbSetNamesReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swaps(&stuff->virtualMods); swaps(&stuff->virtualMods);
@ -367,8 +331,6 @@ static int _X_COLD
SProcXkbGetGeometry(ClientPtr client) SProcXkbGetGeometry(ClientPtr client)
{ {
REQUEST(xkbGetGeometryReq); REQUEST(xkbGetGeometryReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xkbGetGeometryReq); REQUEST_SIZE_MATCH(xkbGetGeometryReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swapl(&stuff->name); swapl(&stuff->name);
@ -379,8 +341,6 @@ static int _X_COLD
SProcXkbSetGeometry(ClientPtr client) SProcXkbSetGeometry(ClientPtr client)
{ {
REQUEST(xkbSetGeometryReq); REQUEST(xkbSetGeometryReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xkbSetGeometryReq); REQUEST_AT_LEAST_SIZE(xkbSetGeometryReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swapl(&stuff->name); swapl(&stuff->name);
@ -397,8 +357,6 @@ static int _X_COLD
SProcXkbPerClientFlags(ClientPtr client) SProcXkbPerClientFlags(ClientPtr client)
{ {
REQUEST(xkbPerClientFlagsReq); REQUEST(xkbPerClientFlagsReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xkbPerClientFlagsReq); REQUEST_SIZE_MATCH(xkbPerClientFlagsReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swapl(&stuff->change); swapl(&stuff->change);
@ -413,8 +371,6 @@ static int _X_COLD
SProcXkbListComponents(ClientPtr client) SProcXkbListComponents(ClientPtr client)
{ {
REQUEST(xkbListComponentsReq); REQUEST(xkbListComponentsReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xkbListComponentsReq); REQUEST_AT_LEAST_SIZE(xkbListComponentsReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swaps(&stuff->maxNames); swaps(&stuff->maxNames);
@ -425,8 +381,6 @@ static int _X_COLD
SProcXkbGetKbdByName(ClientPtr client) SProcXkbGetKbdByName(ClientPtr client)
{ {
REQUEST(xkbGetKbdByNameReq); REQUEST(xkbGetKbdByNameReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xkbGetKbdByNameReq); REQUEST_AT_LEAST_SIZE(xkbGetKbdByNameReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swaps(&stuff->want); swaps(&stuff->want);
@ -438,8 +392,6 @@ static int _X_COLD
SProcXkbGetDeviceInfo(ClientPtr client) SProcXkbGetDeviceInfo(ClientPtr client)
{ {
REQUEST(xkbGetDeviceInfoReq); REQUEST(xkbGetDeviceInfoReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xkbGetDeviceInfoReq); REQUEST_SIZE_MATCH(xkbGetDeviceInfoReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swaps(&stuff->wanted); swaps(&stuff->wanted);
@ -452,8 +404,6 @@ static int _X_COLD
SProcXkbSetDeviceInfo(ClientPtr client) SProcXkbSetDeviceInfo(ClientPtr client)
{ {
REQUEST(xkbSetDeviceInfoReq); REQUEST(xkbSetDeviceInfoReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xkbSetDeviceInfoReq); REQUEST_AT_LEAST_SIZE(xkbSetDeviceInfoReq);
swaps(&stuff->deviceSpec); swaps(&stuff->deviceSpec);
swaps(&stuff->change); swaps(&stuff->change);
@ -465,8 +415,6 @@ static int _X_COLD
SProcXkbSetDebuggingFlags(ClientPtr client) SProcXkbSetDebuggingFlags(ClientPtr client)
{ {
REQUEST(xkbSetDebuggingFlagsReq); REQUEST(xkbSetDebuggingFlagsReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xkbSetDebuggingFlagsReq); REQUEST_AT_LEAST_SIZE(xkbSetDebuggingFlagsReq);
swapl(&stuff->affectFlags); swapl(&stuff->affectFlags);
swapl(&stuff->flags); swapl(&stuff->flags);