From 0b9a2fc6b0ce8095a6735e36fba9e89c173a1b0f Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 2 Jun 2025 17:14:07 +0200
Subject: [PATCH] dix: rename MarkClientException() to dixMarkClientException()

DIX functions should have proper naming.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/dispatch.c | 2 +-
 dix/dix_priv.h | 2 +-
 dix/resource.c | 2 +-
 os/io.c        | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 1528ecb85..2ae2bf307 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3913,7 +3913,7 @@ SendErrorToClient(ClientPtr client, CARD8 majorCode, CARD16 minorCode,
 }
 
 void
-MarkClientException(ClientPtr client)
+dixMarkClientException(ClientPtr client)
 {
     client->noClientException = -1;
 }
diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index 7de9ada0f..f0714d6b4 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -406,7 +406,7 @@ ClientPtr NextAvailableClient(void *ospriv);
  *
  * @param pClient pointer to client that has exception
  */
-void MarkClientException(ClientPtr pClient)
+void dixMarkClientException(ClientPtr pClient)
     _X_ATTRIBUTE_NONNULL_ARG(1);
 
 typedef Bool (*ClientSleepProcPtr) (ClientPtr client, void *closure);
diff --git a/dix/resource.c b/dix/resource.c
index 4dec27109..c856f3171 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -800,7 +800,7 @@ FakeClientID(int client)
     if (!id) {
         if (!client)
             FatalError("FakeClientID: server internal ids exhausted\n");
-        MarkClientException(clients[client]);
+        dixMarkClientException(clients[client]);
         id = ((Mask) client << CLIENTOFFSET) | (SERVER_BIT * 3);
         maxid = id | RESOURCE_ID_MASK;
     }
diff --git a/os/io.c b/os/io.c
index 1ef428d5e..115ffd81c 100644
--- a/os/io.c
+++ b/os/io.c
@@ -742,7 +742,7 @@ WriteToClient(ClientPtr who, int count, const void *__buf)
         }
         else if (!(oco = AllocateOutputBuffer())) {
             AbortClient(who);
-            MarkClientException(who);
+            dixMarkClientException(who);
             return -1;
         }
         oc->output = oco;
@@ -920,7 +920,7 @@ FlushClient(ClientPtr who, OsCommPtr oc, const void *__extraBuf, int extraCount)
                 }
                 if (!obuf) {
                     AbortClient(who);
-                    MarkClientException(who);
+                    dixMarkClientException(who);
                     oco->count = 0;
                     return -1;
                 }
@@ -947,7 +947,7 @@ FlushClient(ClientPtr who, OsCommPtr oc, const void *__extraBuf, int extraCount)
 #endif
         else {
             AbortClient(who);
-            MarkClientException(who);
+            dixMarkClientException(who);
             oco->count = 0;
             return -1;
         }