frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Adam Jackson 2017-03-20 13:42:12 -04:00
parent 40c12a76c2
commit 4e76c27117
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dix/privates.c
View File

@ -105,7 +105,6 @@ static const char *key_names[PRIVATE_LAST] = {
[PRIVATE_CURSOR_BITS] = "CURSOR_BITS", [PRIVATE_CURSOR_BITS] = "CURSOR_BITS",
/* extension privates */ /* extension privates */
[PRIVATE_DAMAGE] = "DAMAGE",
[PRIVATE_GLYPH] = "GLYPH", [PRIVATE_GLYPH] = "GLYPH",
[PRIVATE_GLYPHSET] = "GLYPHSET", [PRIVATE_GLYPHSET] = "GLYPHSET",
[PRIVATE_PICTURE] = "PICTURE", [PRIVATE_PICTURE] = "PICTURE",

1
include/privates.h
View File

@ -46,7 +46,6 @@ typedef enum {
PRIVATE_CURSOR_BITS, PRIVATE_CURSOR_BITS,
/* extension privates */ /* extension privates */
PRIVATE_DAMAGE,
PRIVATE_GLYPH, PRIVATE_GLYPH,
PRIVATE_GLYPHSET, PRIVATE_GLYPHSET,
PRIVATE_PICTURE, PRIVATE_PICTURE,

4
miext/damage/damage.c
View File

@ -1696,7 +1696,7 @@ DamageCreate(DamageReportFunc damageReport,
damageScrPriv(pScreen); damageScrPriv(pScreen);
DamagePtr pDamage; DamagePtr pDamage;
pDamage = dixAllocateObjectWithPrivates(DamageRec, PRIVATE_DAMAGE); pDamage = calloc(1, sizeof(DamageRec));
if (!pDamage) if (!pDamage)
return 0; return 0;
pDamage->pNext = 0; pDamage->pNext = 0;
@ -1821,7 +1821,7 @@ DamageDestroy(DamagePtr pDamage)
(*pScrPriv->funcs.Destroy) (pDamage); (*pScrPriv->funcs.Destroy) (pDamage);
RegionUninit(&pDamage->damage); RegionUninit(&pDamage->damage);
RegionUninit(&pDamage->pendingDamage); RegionUninit(&pDamage->pendingDamage);
dixFreeObjectWithPrivates(pDamage, PRIVATE_DAMAGE); free(pDamage);
} }
Bool Bool

1
miext/damage/damagestr.h
View File

@ -49,7 +49,6 @@ typedef struct _damage {
Bool reportAfter; Bool reportAfter;
RegionRec pendingDamage; /* will be flushed post submission at the latest */ RegionRec pendingDamage; /* will be flushed post submission at the latest */
ScreenPtr pScreen; ScreenPtr pScreen;
PrivateRec *devPrivates;
} DamageRec; } DamageRec;
typedef struct _damageScrPriv { typedef struct _damageScrPriv {