From 05e5ee367122ccde8405ebf9eb9e7349a844879b Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 28 Apr 2025 15:32:43 +0200 Subject: [PATCH] miext: sync: drop useless CloseScreen wrapping This wrapped CloseScreen function doesn't do anything actually useful, so no need to keep it around any longer. It used to do a free() on the private data (which had been wrong in the first place) but this had been removed and so the whole function became useless, it had been forgotten to be swept away. Fixes: 469d5bf8b75038631c27edbb0f9cdf7d737fa233 Signed-off-by: Enrico Weigelt, metux IT consult --- miext/sync/misync.c | 14 -------------- miext/sync/misync_priv.h | 3 --- 2 files changed, 17 deletions(-) diff --git a/miext/sync/misync.c b/miext/sync/misync.c index 806f7adbe..f022d2b63 100644 --- a/miext/sync/misync.c +++ b/miext/sync/misync.c @@ -149,16 +149,6 @@ miSyncGetScreenFuncs(ScreenPtr pScreen) return &pScreenPriv->funcs; } -static Bool -SyncCloseScreen(ScreenPtr pScreen) -{ - SyncScreenPrivPtr pScreenPriv = SYNC_SCREEN_PRIV(pScreen); - - pScreen->CloseScreen = pScreenPriv->CloseScreen; - - return (*pScreen->CloseScreen) (pScreen); -} - Bool miSyncSetup(ScreenPtr pScreen) { @@ -179,10 +169,6 @@ miSyncSetup(ScreenPtr pScreen) if (!pScreenPriv->funcs.CreateFence) { pScreenPriv->funcs = miSyncScreenFuncs; - - /* Wrap CloseScreen to clean up */ - pScreenPriv->CloseScreen = pScreen->CloseScreen; - pScreen->CloseScreen = SyncCloseScreen; } return TRUE; diff --git a/miext/sync/misync_priv.h b/miext/sync/misync_priv.h index 76ac40d9a..f43f57198 100644 --- a/miext/sync/misync_priv.h +++ b/miext/sync/misync_priv.h @@ -13,9 +13,6 @@ extern DevPrivateKeyRec miSyncScreenPrivateKey; typedef struct _syncScreenPriv { /* Wrappable sync-specific screen functions */ SyncScreenFuncsRec funcs; - - /* Wrapped screen functions */ - CloseScreenProcPtr CloseScreen; } SyncScreenPrivRec, *SyncScreenPrivPtr; #define SYNC_SCREEN_PRIV(pScreen) \