diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-04 11:38:03 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-07 10:51:16 +1000 |
| commit | 9005ec4ce19d704d5055232d2a36acee3247be67 (patch) | |
| tree | d227a6efc77793574e3ede7f2d086c992c61b62b | |
| parent | 1e0caf9a2ca983f171976822d9c04bacc14e9af7 (diff) | |
dix: remove dixLookupResource - we don't have any users left.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
| -rw-r--r-- | dix/deprecated.c | 18 | ||||
| -rw-r--r-- | include/resource.h | 8 |
2 files changed, 0 insertions, 26 deletions
diff --git a/dix/deprecated.c b/dix/deprecated.c index 8123886ca..21d0f574d 100644 --- a/dix/deprecated.c +++ b/dix/deprecated.c @@ -162,22 +162,4 @@ LookupIDByClass(XID id, RESTYPE classes) return val; } -/* replaced by dixLookupResourceBy{Type,Class} */ -_X_EXPORT int -dixLookupResource (pointer *result, XID id, RESTYPE rtype, - ClientPtr client, Mask mode) -{ - Bool istype = ((rtype & TypeMask) && (rtype != RC_ANY)) || (rtype == RT_NONE); - - static int warn = 1; - if (warn > 0 && --warn) - ErrorF("Warning: dixLookupResource() " - "is deprecated. Please convert your driver/module " - "to use dixLookupResourceByType/dixLookupResourceByClass().\n"); - if (istype) - return dixLookupResourceByType (result, id, rtype, client, mode); - else - return dixLookupResourceByClass (result, id, rtype, client, mode); -} - /* end deprecated functions */ diff --git a/include/resource.h b/include/resource.h index 774f81b56..8ed4e569e 100644 --- a/include/resource.h +++ b/include/resource.h @@ -257,14 +257,6 @@ extern _X_EXPORT RESTYPE TypeMask; #define X_DEPRECATED #endif -/* replaced by dixLookupResourceByType or dixLookupResourceByClass */ -extern int dixLookupResource( - pointer *result, - XID id, - RESTYPE rtype, - ClientPtr client, - Mask access_mode) X_DEPRECATED; - /* replaced by dixLookupResourceByType */ extern _X_EXPORT pointer SecurityLookupIDByType( ClientPtr client, |