From b3ff41146263928b56f154b55079c90e19b3a7e4 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 8 Jul 2024 16:11:26 +0200
Subject: [PATCH] [PR #1534] Xext: xf86bigfont: use REQUEST_HEAD_STRUCT and
 REQUEST_FIELD_* macros

PR: https://github.com/X11Libre/xserver/pull/1534
---
 Xext/xf86bigfont.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index 0f856996b..35e4fdb94 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -267,7 +267,7 @@ XF86BigfontResetProc(ExtensionEntry * extEntry)
 static int
 ProcXF86BigfontQueryVersion(ClientPtr client)
 {
-    REQUEST_SIZE_MATCH(xXF86BigfontQueryVersionReq);
+    X_REQUEST_HEAD_STRUCT(xXF86BigfontQueryVersionReq);
 
     xXF86BigfontQueryVersionReply reply = {
         .majorVersion = SERVER_XF86BIGFONT_MAJOR_VERSION,
@@ -320,14 +320,10 @@ static inline void writeCharInfo(x_rpcbuf_t *rpcbuf, xCharInfo CI) {
 static int
 ProcXF86BigfontQueryFont(ClientPtr client)
 {
-    REQUEST(xXF86BigfontQueryFontReq);
-    REQUEST_SIZE_MATCH(xXF86BigfontQueryFontReq);
-
-    if (client->swapped)
-        swapl(&stuff->id);
+    X_REQUEST_HEAD_NO_CHECK(xXF86BigfontQueryFontReq);
+    X_REQUEST_FIELD_CARD32(id);
 
     FontPtr pFont;
-
     CARD32 stuff_flags;
     xCharInfo *pmax;
     xCharInfo *pmin;