diff options
| author | Keith Packard <keithp@keithp.com> | 2008-08-06 15:26:24 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-03-09 13:08:09 -0700 |
| commit | f8dd80d13bb5313a11b38b280f8ad3e22f0a6300 (patch) | |
| tree | e0aea0e92304c050bb9eda0b7e4b71ad1d242e90 /dix/dixutils.c | |
| parent | 0d9a42dc0380d1583889b6b6521bd5a2451735d4 (diff) | |
Replace dixLookupResource by dixLookupResourceBy{Type,Class}
dixLookupResource attempted to automatically detect whether the caller
wanted a lookup by-type or by-class, unfortunately, it guessed wrong for
RT_NONE. Instead of trying to make the guess better, this patch just reverts
the unification and creates separate functions for each operation.
Diffstat (limited to 'dix/dixutils.c')
| -rw-r--r-- | dix/dixutils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/dixutils.c b/dix/dixutils.c index a382be63f..1bdeee064 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -216,7 +216,7 @@ dixLookupDrawable(DrawablePtr *pDraw, XID id, ClientPtr client, if (id == INVALID) return BadDrawable; - rc = dixLookupResource((pointer *)&pTmp, id, RC_DRAWABLE, client, access); + rc = dixLookupResourceByClass((pointer *)&pTmp, id, RC_DRAWABLE, client, access); if (rc == BadValue) return BadDrawable; @@ -259,7 +259,7 @@ dixLookupClient(ClientPtr *pClient, XID rid, ClientPtr client, Mask access) if (!clientIndex || !clients[clientIndex] || (rid & SERVER_BIT)) goto bad; - rc = dixLookupResource(&pRes, rid, RC_ANY, client, DixGetAttrAccess); + rc = dixLookupResourceByClass(&pRes, rid, RC_ANY, client, DixGetAttrAccess); if (rc != Success) goto bad; |