From b6945455bf32b20610ffa6499938293922ac2a4d Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 8 Sep 2025 13:41:27 +0200
Subject: [PATCH] render: consolidate byte-swapping in ProcRenderFreeGlyphs()

No need for extra functions and call tables for the few trivial lines.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 render/render.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/render/render.c b/render/render.c
index bc33e52aba..5aaa6ef6eb 100644
--- a/render/render.c
+++ b/render/render.c
@@ -102,7 +102,6 @@ static int SProcRenderTrapezoids(ClientPtr pClient);
 static int SProcRenderTriangles(ClientPtr pClient);
 static int SProcRenderTriStrip(ClientPtr pClient);
 static int SProcRenderTriFan(ClientPtr pClient);
-static int SProcRenderFreeGlyphs(ClientPtr pClient);
 static int SProcRenderCompositeGlyphs(ClientPtr pClient);
 static int SProcRenderFillRectangles(ClientPtr pClient);
 static int SProcRenderSetPictureTransform(ClientPtr pClient);
@@ -176,7 +175,7 @@ int (*SProcRenderVector[RenderNumberRequests]) (ClientPtr) = {
         ProcRenderFreeGlyphSet,
         ProcRenderAddGlyphs,
         _not_implemented, /* SProcRenderAddGlyphsFromPicture */
-        SProcRenderFreeGlyphs,
+        ProcRenderFreeGlyphs,
         SProcRenderCompositeGlyphs,
         SProcRenderCompositeGlyphs,
         SProcRenderCompositeGlyphs,
@@ -1150,12 +1149,18 @@ static int
 ProcRenderFreeGlyphs(ClientPtr client)
 {
     REQUEST(xRenderFreeGlyphsReq);
+    REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq);
+
+    if (client->swapped) {
+        swapl(&stuff->glyphset);
+        SwapRestL(stuff);
+    }
+
     GlyphSetPtr glyphSet;
     int rc, nglyph;
     CARD32 *gids;
     CARD32 glyph;
 
-    REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq);
     rc = dixLookupResourceByType((void **) &glyphSet, stuff->glyphset,
                                  GlyphSetType, client, DixRemoveAccess);
     if (rc != Success) {
@@ -2032,16 +2037,6 @@ SProcRenderTriFan(ClientPtr client)
     return ProcRenderTriFan(client);
 }
 
-static int _X_COLD
-SProcRenderFreeGlyphs(ClientPtr client)
-{
-    REQUEST(xRenderFreeGlyphsReq);
-    REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq);
-    swapl(&stuff->glyphset);
-    SwapRestL(stuff);
-    return ProcRenderFreeGlyphs(client);
-}
-
 static int _X_COLD
 SProcRenderCompositeGlyphs(ClientPtr client)
 {