diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-04-24 23:56:36 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2010-05-19 12:32:48 -0700 |
| commit | c38552d115e3bc71ad6179a8ad0d68778e943793 (patch) | |
| tree | af6a02d6e34896c2a91b49ba568dab6bbad8b7d8 /damageext | |
| parent | e291c561821ae86b7dd74269d5cd29bc31703962 (diff) | |
Add typed resource-lookup errors for non-core resource types.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'damageext')
| -rw-r--r-- | damageext/damageext.c | 3 | ||||
| -rw-r--r-- | damageext/damageextint.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/damageext/damageext.c b/damageext/damageext.c index d9234345b..e4eda5efc 100644 --- a/damageext/damageext.c +++ b/damageext/damageext.c @@ -29,7 +29,6 @@ static unsigned char DamageReqCode; static int DamageEventBase; -static int DamageErrorBase; static RESTYPE DamageExtType; static RESTYPE DamageExtWinType; @@ -515,8 +514,8 @@ DamageExtensionInit(void) { DamageReqCode = (unsigned char)extEntry->base; DamageEventBase = extEntry->eventBase; - DamageErrorBase = extEntry->errorBase; EventSwapVector[DamageEventBase + XDamageNotify] = (EventSwapPtr) SDamageNotifyEvent; + SetResourceTypeErrorValue(DamageExtType, extEntry->errorBase + BadDamage); } } diff --git a/damageext/damageextint.h b/damageext/damageextint.h index d40ba3e1c..a235cb908 100644 --- a/damageext/damageextint.h +++ b/damageext/damageextint.h @@ -62,7 +62,7 @@ typedef struct _DamageExt { int rc = dixLookupResourceByType((pointer *)&(pDamageExt), rid, \ DamageExtType, client, mode); \ if (rc != Success) \ - return (rc == BadValue) ? DamageErrorBase + BadDamage : rc; \ + return rc; \ } void |