From b05fc4f013200e3eee76e6fc59be7741cb0eba41 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 13 Mar 2025 14:23:14 +0100
Subject: [PATCH] dix: replace FreeDefaultStipple()

It's just a one-liner only called once, so no actual need for it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/gc.c      | 7 -------
 dix/gc_priv.h | 2 --
 dix/main.c    | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/dix/gc.c b/dix/gc.c
index ecaee32fb..b49aa46d2 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -903,13 +903,6 @@ CreateDefaultStipple(int screenNum)
     return TRUE;
 }
 
-void
-FreeDefaultStipple(int screenNum)
-{
-    ScreenPtr pScreen = screenInfo.screens[screenNum];
-    dixDestroyPixmap(pScreen->defaultStipple, 0);
-}
-
 int
 SetDashes(GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pdash)
 {
diff --git a/dix/gc_priv.h b/dix/gc_priv.h
index 52b6f22a4..8079f5095 100644
--- a/dix/gc_priv.h
+++ b/dix/gc_priv.h
@@ -28,8 +28,6 @@ Bool CreateGCperDepth(int screenNum);
 
 Bool CreateDefaultStipple(int screenNum);
 
-void FreeDefaultStipple(int screenNum);
-
 int SetDashes(GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pdash);
 
 int VerifyRectOrder(int nrects, xRectangle *prects, int ordering);
diff --git a/dix/main.c b/dix/main.c
index 8b953dbf3..0936fc1ff 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -328,7 +328,7 @@ dix_main(int argc, char *argv[], char *envp[])
 
         for (i = screenInfo.numScreens - 1; i >= 0; i--) {
             FreeGCperDepth(screenInfo.screens[i]);
-            FreeDefaultStipple(i);
+            dixDestroyPixmap(screenInfo.screens[i]->defaultStipple, 0);
             dixFreeScreenSpecificPrivates(screenInfo.screens[i]);
             (*screenInfo.screens[i]->CloseScreen) (screenInfo.screens[i]);
             dixFreePrivates(screenInfo.screens[i]->devPrivates, PRIVATE_SCREEN);