From e1b3bbafa8d0ae6cd1e21a79eb83ee1812989dd9 Mon Sep 17 00:00:00 2001
From: Marc-Alexandre Espiaut <76531574+malespiaut@users.noreply.github.com>
Date: Fri, 28 Nov 2025 10:09:44 +0100
Subject: [PATCH] dix: remove dixLookupBuiltinColor() unused `screen` argument

Signed-off-by: Marc-Alexandre Espiaut <76531574+malespiaut@users.noreply.github.com>
---
 dix/color.c    | 3 +--
 dix/dispatch.c | 8 +++-----
 dix/dix_priv.h | 3 +--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/dix/color.c b/dix/color.c
index 80cda9287..439b3eb5c 100644
--- a/dix/color.c
+++ b/dix/color.c
@@ -845,8 +845,7 @@ static const BuiltinColor BuiltinColors[] = {
 };
 
 Bool
-dixLookupBuiltinColor(int screen,
-                      char *name,
+dixLookupBuiltinColor(char *name,
                       unsigned int len,
                       unsigned short *pred,
                       unsigned short *pgreen,
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 9fe5af0f1..9709ebf74 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -2758,7 +2758,7 @@ ProcAllocNamedColor(ClientPtr client)
     xAllocNamedColorReply rep = { 0 };
 
     if (!dixLookupBuiltinColor
-            (pcmp->pScreen->myNum, (char *) &stuff[1], stuff->nbytes,
+            ((char *) &stuff[1], stuff->nbytes,
              &rep.exactRed, &rep.exactGreen, &rep.exactBlue))
         return BadName;
 
@@ -2987,8 +2987,7 @@ ProcStoreNamedColor(ClientPtr client)
     if (rc == Success) {
         xColorItem def;
 
-        if (dixLookupBuiltinColor(pcmp->pScreen->myNum,
-                                  (char *) &stuff[1],
+        if (dixLookupBuiltinColor((char *) &stuff[1],
                                   stuff->nbytes,
                                   &def.red,
                                   &def.green,
@@ -3063,8 +3062,7 @@ ProcLookupColor(ClientPtr client)
     }
 
     CARD16 exactRed, exactGreen, exactBlue;
-    if (!dixLookupBuiltinColor(pcmp->pScreen->myNum,
-                               (char *) &stuff[1],
+    if (!dixLookupBuiltinColor((char *) &stuff[1],
                                stuff->nbytes,
                                &exactRed,
                                &exactGreen,
diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index 1dbab2837..d4252ee6e 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -103,8 +103,7 @@ void InitClient(ClientPtr client, int i, void *ospriv);
 int FillFontPath(x_rpcbuf_t *rpcbuf);
 
 /* lookup builtin color by name */
-Bool dixLookupBuiltinColor(int screen,
-                           char *name,
+Bool dixLookupBuiltinColor(char *name,
                            unsigned len,
                            unsigned short *pred,
                            unsigned short *pgreen,