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

Xext: xf86bigfont: use REQUEST_HEAD_STRUCT and REQUEST_FIELD_* macros 

Use the new macros to make request struct parsing / field swapping
much easier.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-07-08 16:11:26 +02:00
parent c133b094ef
commit 9cc70cd9ff
1 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Xext/xf86bigfont.c
View File

@ -265,7 +265,7 @@ XF86BigfontResetProc(ExtensionEntry * extEntry)
static int static int
ProcXF86BigfontQueryVersion(ClientPtr client) ProcXF86BigfontQueryVersion(ClientPtr client)
{ {
REQUEST_SIZE_MATCH(xXF86BigfontQueryVersionReq); REQUEST_HEAD_STRUCT(xXF86BigfontQueryVersionReq);
xXF86BigfontQueryVersionReply reply = { xXF86BigfontQueryVersionReply reply = {
.type = X_Reply, .type = X_Reply,
@ -314,9 +314,10 @@ swapCharInfo(xCharInfo * pCI)
static int static int
ProcXF86BigfontQueryFont(ClientPtr client) ProcXF86BigfontQueryFont(ClientPtr client)
{ {
FontPtr pFont; REQUEST_HEAD_NO_CHECK(xXF86BigfontQueryFontReq);
REQUEST_FIELD_CARD32(id);
REQUEST(xXF86BigfontQueryFontReq); FontPtr pFont;
CARD32 stuff_flags; CARD32 stuff_flags;
xCharInfo *pmax; xCharInfo *pmax;
xCharInfo *pmin; xCharInfo *pmin;
@ -644,37 +645,6 @@ ProcXF86BigfontDispatch(ClientPtr client)
} }
} }
static int _X_COLD
SProcXF86BigfontQueryVersion(ClientPtr client)
{
REQUEST(xXF86BigfontQueryVersionReq);
return ProcXF86BigfontQueryVersion(client);
}
static int _X_COLD
SProcXF86BigfontQueryFont(ClientPtr client)
{
REQUEST(xXF86BigfontQueryFontReq);
REQUEST_SIZE_MATCH(xXF86BigfontQueryFontReq);
swapl(&stuff->id);
return ProcXF86BigfontQueryFont(client);
}
static int _X_COLD
SProcXF86BigfontDispatch(ClientPtr client)
{
REQUEST(xReq);
switch (stuff->data) {
case X_XF86BigfontQueryVersion:
return SProcXF86BigfontQueryVersion(client);
case X_XF86BigfontQueryFont:
return SProcXF86BigfontQueryFont(client);
default:
return BadRequest;
}
}
void void
XFree86BigfontExtensionInit(void) XFree86BigfontExtensionInit(void)
{ {
@ -682,7 +652,7 @@ XFree86BigfontExtensionInit(void)
XF86BigfontNumberEvents, XF86BigfontNumberEvents,
XF86BigfontNumberErrors, XF86BigfontNumberErrors,
ProcXF86BigfontDispatch, ProcXF86BigfontDispatch,
SProcXF86BigfontDispatch, ProcXF86BigfontDispatch,
XF86BigfontResetProc, StandardMinorOpcode)) { XF86BigfontResetProc, StandardMinorOpcode)) {
#ifdef MITSHM #ifdef MITSHM
#ifdef MUST_CHECK_FOR_SHM_SYSCALL #ifdef MUST_CHECK_FOR_SHM_SYSCALL