We're no longer using it for anything, yay. Signed-off-by: Adam Jackson <a...@redhat.com> --- hw/xfree86/common/xf86cmap.c | 27 --------------------------- 1 file changed, 27 deletions(-)
diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c index 0f4926c18..0025b7b22 100644 --- a/hw/xfree86/common/xf86cmap.c +++ b/hw/xfree86/common/xf86cmap.c @@ -94,17 +94,10 @@ typedef struct { Bool isDGAmode; } CMapScreenRec, *CMapScreenPtr; -typedef struct { - LOCO *unused; -} CMapColormapRec, *CMapColormapPtr; - static DevPrivateKeyRec CMapScreenKeyRec; #define CMapScreenKeyRegistered dixPrivateKeyRegistered(&CMapScreenKeyRec) #define CMapScreenKey (&CMapScreenKeyRec) -static DevPrivateKeyRec CMapColormapKeyRec; - -#define CMapColormapKey (&CMapColormapKeyRec) static CMapScreenPtr getCMapScreenPtr(ScreenPtr pScreen) @@ -112,12 +105,6 @@ getCMapScreenPtr(ScreenPtr pScreen) return dixLookupPrivate(&pScreen->devPrivates, CMapScreenKey); } -static CMapColormapPtr -getCMapColormapPtr(ColormapPtr pmap) -{ - return dixLookupPrivate(&pmap->devPrivates, CMapColormapKey); -} - static void CMapInstallColormap(ColormapPtr); static void CMapStoreColors(ColormapPtr, int, xColorItem *); static Bool CMapCloseScreen(ScreenPtr); @@ -144,8 +131,6 @@ xf86ColormapAllocatePrivates(ScrnInfoPtr pScrn) if (!dixRegisterPrivateKey(&CMapScreenKeyRec, PRIVATE_SCREEN, 0)) return FALSE; - if (!dixRegisterPrivateKey(&CMapColormapKeyRec, PRIVATE_COLORMAP, 0)) - return FALSE; return TRUE; } @@ -279,15 +264,8 @@ static Bool CMapAllocateColormapPrivate(ColormapPtr pmap) { CMapScreenPtr pScreenPriv = getCMapScreenPtr(pmap->pScreen); - CMapColormapPtr pColPriv; CMapLinkPtr pLink; - if (!(pColPriv = malloc(sizeof(CMapColormapRec)))) { - return FALSE; - } - - dixSetPrivate(&pmap->devPrivates, CMapColormapKey, pColPriv); - /* add map to list */ pLink = malloc(sizeof(CMapLink)); if (pLink) { @@ -321,13 +299,8 @@ CMapDestroyColormap(ColormapPtr cmap) { ScreenPtr pScreen = cmap->pScreen; CMapScreenPtr pScreenPriv = getCMapScreenPtr(pScreen); - CMapColormapPtr pColPriv = getCMapColormapPtr(cmap); CMapLinkPtr prevLink = NULL, pLink = pScreenPriv->maps; - if (pColPriv) { - free(pColPriv); - } - /* remove map from list */ while (pLink) { if (pLink->cmap == cmap) { -- 2.14.3 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel