From a93296c87e78e96d86fd545bf429e652ec277293 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 6 Aug 2024 14:29:26 +0200 Subject: [PATCH] (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 --- xkb/xkbSwap.c | 52 --------------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c index efbdb81c1..b7ae8b66d 100644 --- a/xkb/xkbSwap.c +++ b/xkb/xkbSwap.c @@ -45,8 +45,6 @@ static int _X_COLD SProcXkbUseExtension(ClientPtr client) { REQUEST(xkbUseExtensionReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xkbUseExtensionReq); swaps(&stuff->wantedMajor); swaps(&stuff->wantedMinor); @@ -57,8 +55,6 @@ static int _X_COLD SProcXkbSelectEvents(ClientPtr client) { REQUEST(xkbSelectEventsReq); - - swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xkbSelectEventsReq); swaps(&stuff->deviceSpec); swaps(&stuff->affectWhich); @@ -135,8 +131,6 @@ static int _X_COLD SProcXkbBell(ClientPtr client) { REQUEST(xkbBellReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xkbBellReq); swaps(&stuff->deviceSpec); swaps(&stuff->bellClass); @@ -152,8 +146,6 @@ static int _X_COLD SProcXkbGetState(ClientPtr client) { REQUEST(xkbGetStateReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xkbGetStateReq); swaps(&stuff->deviceSpec); return ProcXkbGetState(client); @@ -163,8 +155,6 @@ static int _X_COLD SProcXkbLatchLockState(ClientPtr client) { REQUEST(xkbLatchLockStateReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xkbLatchLockStateReq); swaps(&stuff->deviceSpec); swaps(&stuff->groupLatch); @@ -175,8 +165,6 @@ static int _X_COLD SProcXkbGetControls(ClientPtr client) { REQUEST(xkbGetControlsReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xkbGetControlsReq); swaps(&stuff->deviceSpec); return ProcXkbGetControls(client); @@ -186,8 +174,6 @@ static int _X_COLD SProcXkbSetControls(ClientPtr client) { REQUEST(xkbSetControlsReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xkbSetControlsReq); swaps(&stuff->deviceSpec); swaps(&stuff->affectInternalVMods); @@ -219,8 +205,6 @@ static int _X_COLD SProcXkbGetMap(ClientPtr client) { REQUEST(xkbGetMapReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xkbGetMapReq); swaps(&stuff->deviceSpec); swaps(&stuff->full); @@ -233,8 +217,6 @@ static int _X_COLD SProcXkbSetMap(ClientPtr client) { REQUEST(xkbSetMapReq); - - swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xkbSetMapReq); swaps(&stuff->deviceSpec); swaps(&stuff->present); @@ -249,8 +231,6 @@ static int _X_COLD SProcXkbGetCompatMap(ClientPtr client) { REQUEST(xkbGetCompatMapReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xkbGetCompatMapReq); swaps(&stuff->deviceSpec); swaps(&stuff->firstSI); @@ -262,8 +242,6 @@ static int _X_COLD SProcXkbSetCompatMap(ClientPtr client) { REQUEST(xkbSetCompatMapReq); - - swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xkbSetCompatMapReq); swaps(&stuff->deviceSpec); swaps(&stuff->firstSI); @@ -275,8 +253,6 @@ static int _X_COLD SProcXkbGetIndicatorState(ClientPtr client) { REQUEST(xkbGetIndicatorStateReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xkbGetIndicatorStateReq); swaps(&stuff->deviceSpec); return ProcXkbGetIndicatorState(client); @@ -286,8 +262,6 @@ static int _X_COLD SProcXkbGetIndicatorMap(ClientPtr client) { REQUEST(xkbGetIndicatorMapReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xkbGetIndicatorMapReq); swaps(&stuff->deviceSpec); swapl(&stuff->which); @@ -298,8 +272,6 @@ static int _X_COLD SProcXkbSetIndicatorMap(ClientPtr client) { REQUEST(xkbSetIndicatorMapReq); - - swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xkbSetIndicatorMapReq); swaps(&stuff->deviceSpec); swapl(&stuff->which); @@ -310,8 +282,6 @@ static int _X_COLD SProcXkbGetNamedIndicator(ClientPtr client) { REQUEST(xkbGetNamedIndicatorReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xkbGetNamedIndicatorReq); swaps(&stuff->deviceSpec); swaps(&stuff->ledClass); @@ -324,8 +294,6 @@ static int _X_COLD SProcXkbSetNamedIndicator(ClientPtr client) { REQUEST(xkbSetNamedIndicatorReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xkbSetNamedIndicatorReq); swaps(&stuff->deviceSpec); swaps(&stuff->ledClass); @@ -340,8 +308,6 @@ static int _X_COLD SProcXkbGetNames(ClientPtr client) { REQUEST(xkbGetNamesReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xkbGetNamesReq); swaps(&stuff->deviceSpec); swapl(&stuff->which); @@ -352,8 +318,6 @@ static int _X_COLD SProcXkbSetNames(ClientPtr client) { REQUEST(xkbSetNamesReq); - - swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xkbSetNamesReq); swaps(&stuff->deviceSpec); swaps(&stuff->virtualMods); @@ -367,8 +331,6 @@ static int _X_COLD SProcXkbGetGeometry(ClientPtr client) { REQUEST(xkbGetGeometryReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xkbGetGeometryReq); swaps(&stuff->deviceSpec); swapl(&stuff->name); @@ -379,8 +341,6 @@ static int _X_COLD SProcXkbSetGeometry(ClientPtr client) { REQUEST(xkbSetGeometryReq); - - swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xkbSetGeometryReq); swaps(&stuff->deviceSpec); swapl(&stuff->name); @@ -397,8 +357,6 @@ static int _X_COLD SProcXkbPerClientFlags(ClientPtr client) { REQUEST(xkbPerClientFlagsReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xkbPerClientFlagsReq); swaps(&stuff->deviceSpec); swapl(&stuff->change); @@ -413,8 +371,6 @@ static int _X_COLD SProcXkbListComponents(ClientPtr client) { REQUEST(xkbListComponentsReq); - - swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xkbListComponentsReq); swaps(&stuff->deviceSpec); swaps(&stuff->maxNames); @@ -425,8 +381,6 @@ static int _X_COLD SProcXkbGetKbdByName(ClientPtr client) { REQUEST(xkbGetKbdByNameReq); - - swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xkbGetKbdByNameReq); swaps(&stuff->deviceSpec); swaps(&stuff->want); @@ -438,8 +392,6 @@ static int _X_COLD SProcXkbGetDeviceInfo(ClientPtr client) { REQUEST(xkbGetDeviceInfoReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xkbGetDeviceInfoReq); swaps(&stuff->deviceSpec); swaps(&stuff->wanted); @@ -452,8 +404,6 @@ static int _X_COLD SProcXkbSetDeviceInfo(ClientPtr client) { REQUEST(xkbSetDeviceInfoReq); - - swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xkbSetDeviceInfoReq); swaps(&stuff->deviceSpec); swaps(&stuff->change); @@ -465,8 +415,6 @@ static int _X_COLD SProcXkbSetDebuggingFlags(ClientPtr client) { REQUEST(xkbSetDebuggingFlagsReq); - - swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xkbSetDebuggingFlagsReq); swapl(&stuff->affectFlags); swapl(&stuff->flags);