From 4e76c2711740b775242170d8e5ee56c7e6829cce Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 20 Mar 2017 13:42:12 -0400 Subject: dix: Remove PRIVATE_DAMAGE None of this is actually wired up to anything, so we can also remove the devPrivates from the DamageRec. The DamageExtRec is what would need devPrivates for selinux labeling, in principle. Signed-off-by: Adam Jackson Reviewed-by: Eric Anholt --- miext/damage/damage.c | 4 ++-- miext/damage/damagestr.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'miext') diff --git a/miext/damage/damage.c b/miext/damage/damage.c index 2fae03fc2..de14d5cc8 100644 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -1696,7 +1696,7 @@ DamageCreate(DamageReportFunc damageReport, damageScrPriv(pScreen); DamagePtr pDamage; - pDamage = dixAllocateObjectWithPrivates(DamageRec, PRIVATE_DAMAGE); + pDamage = calloc(1, sizeof(DamageRec)); if (!pDamage) return 0; pDamage->pNext = 0; @@ -1821,7 +1821,7 @@ DamageDestroy(DamagePtr pDamage) (*pScrPriv->funcs.Destroy) (pDamage); RegionUninit(&pDamage->damage); RegionUninit(&pDamage->pendingDamage); - dixFreeObjectWithPrivates(pDamage, PRIVATE_DAMAGE); + free(pDamage); } Bool diff --git a/miext/damage/damagestr.h b/miext/damage/damagestr.h index 278615634..0d07872e5 100644 --- a/miext/damage/damagestr.h +++ b/miext/damage/damagestr.h @@ -49,7 +49,6 @@ typedef struct _damage { Bool reportAfter; RegionRec pendingDamage; /* will be flushed post submission at the latest */ ScreenPtr pScreen; - PrivateRec *devPrivates; } DamageRec; typedef struct _damageScrPriv { -- cgit v1.2.3