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

misc.h: drop LengthRestB() macro 

Only used at exactly one place, for trivial size computation, so not worth
having an extra macro in a public header for this.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1805>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-02-17 17:48:20 +01:00 committed by Marge Bot
parent 9af363b046
commit a6b2eb3780
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dix/swapreq.c
View File

@ -756,7 +756,7 @@ SProcStoreColors(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xStoreColorsReq);
swapl(&stuff->cmap);
pItem = (xColorItem *) &stuff[1];
for (count = LengthRestB(stuff) / sizeof(xColorItem); --count >= 0;)
for (count = ((client->req_len << 2) - sizeof(xStoreColorsReq)) / sizeof(xColorItem); --count >= 0;)
SwapColorItem(pItem++);
return ((*ProcVector[X_StoreColors]) (client));
}

2
doc/Xserver-spec.xml
View File

@ -600,7 +600,7 @@ are: REQUEST, REQUEST_SIZE_MATCH, REQUEST_AT_LEAST_SIZE,
REQUEST_FIXED_SIZE, LEGAL_NEW_RESOURCE, and
VALIDATE_DRAWABLE_AND_GC. Useful byte swapping macros can be found
in Xserver/include/dix.h: WriteReplyToClient and WriteSwappedDataToClient; and
in Xserver/include/misc.h: bswap_64, bswap_32, bswap_16, LengthRestB, LengthRestS,
in Xserver/include/misc.h: bswap_64, bswap_32, bswap_16, LengthRestS,
LengthRestL, SwapRestS, SwapRestL, swapl, swaps, cpswapl, and cpswaps.</para>
</section>
</section>

3
include/misc.h
View File

@ -250,9 +250,6 @@ version_compare(uint32_t a_major, uint32_t a_minor,
/* some macros to help swap requests, replies, and events */
#define LengthRestB(stuff) \
((client->req_len << 2) - sizeof(*stuff))
#define LengthRestS(stuff) \
((client->req_len << 1) - (sizeof(*stuff) >> 1))