diff options
| author | Pierre Ossman <ossman@cendio.se> | 2021-07-12 17:26:54 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2021-07-13 14:26:04 +0200 |
| commit | a52d8757df646918d303e2bcee1ea128dde4cdad (patch) | |
| tree | 408a03bcb5c302390133e14a023b766f170a38d6 | |
| parent | c11f8f9930a9ec0fc4a9f3ff7748eef4414591db (diff) | |
| download | tigervnc-a52d8757df646918d303e2bcee1ea128dde4cdad.tar.gz tigervnc-a52d8757df646918d303e2bcee1ea128dde4cdad.zip | |
Remove CloseScreen() wrapper
The memory leak this worked around was fixed in X.org 1.16.
| -rw-r--r-- | unix/xserver/hw/vnc/xvnc.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c index 1f95207d..6bae8e3b 100644 --- a/unix/xserver/hw/vnc/xvnc.c +++ b/unix/xserver/hw/vnc/xvnc.c @@ -113,8 +113,6 @@ typedef struct { unsigned int lineBias; - CloseScreenProcPtr closeScreen; - vfbFramebufferInfo fb; Bool pixelFormatDefined; @@ -1109,23 +1107,6 @@ vncRandRInit(ScreenPtr pScreen) } static Bool -vfbCloseScreen(ScreenPtr pScreen) -{ - vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum]; - - pScreen->CloseScreen = pvfb->closeScreen; - - /* - * fb overwrites miCloseScreen, so do this here - */ - if (pScreen->devPrivate) - (*pScreen->DestroyPixmap) ((PixmapPtr) pScreen->devPrivate); - pScreen->devPrivate = NULL; - - return pScreen->CloseScreen(pScreen); -} - -static Bool vfbScreenInit(ScreenPtr pScreen, int argc, char **argv) { int index = pScreen->myNum; @@ -1250,9 +1231,6 @@ vfbScreenInit(ScreenPtr pScreen, int argc, char **argv) miSetZeroLineBias(pScreen, pvfb->lineBias); - pvfb->closeScreen = pScreen->CloseScreen; - pScreen->CloseScreen = vfbCloseScreen; - return TRUE; } /* end vfbScreenInit */ |