diff options
author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-04-04 12:00:15 -0400 |
---|---|---|
committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2007-04-04 16:00:15 -0400 |
commit | ed75b056511ccb429c48c6c55d14dc7ae79e75a3 (patch) | |
tree | 2bce240f5c998b371895bdb4dd94a6e679067f35 /include/resource.h | |
parent | 63e46e4fc3e98751f2edbed9c79ef3d5dc2dadc6 (diff) |
dix: add new, combined resource lookup function. Move all dix lookup API
deprecated so far to a new file dix/deprecated.c. Remove the deprecation
warnings for the time being.
Diffstat (limited to 'include/resource.h')
-rw-r--r-- | include/resource.h | 55 |
1 files changed, 35 insertions, 20 deletions
diff --git a/include/resource.h b/include/resource.h index f7fa5f188..d2ecfdea7 100644 --- a/include/resource.h +++ b/include/resource.h @@ -212,32 +212,18 @@ extern Bool LegalNewID( XID /*id*/, ClientPtr /*client*/); -extern pointer LookupIDByType( - XID /*id*/, - RESTYPE /*rtype*/); - -extern pointer LookupIDByClass( - XID /*id*/, - RESTYPE /*classes*/); - extern pointer LookupClientResourceComplex( ClientPtr client, RESTYPE type, FindComplexResType func, pointer cdata); -extern pointer SecurityLookupIDByType( - ClientPtr /*client*/, - XID /*id*/, - RESTYPE /*rtype*/, - Mask /*access_mode*/); - -extern pointer SecurityLookupIDByClass( - ClientPtr /*client*/, - XID /*id*/, - RESTYPE /*classes*/, - Mask /*access_mode*/); - +extern int dixLookupResource( + pointer *result, + XID id, + RESTYPE rtype, + ClientPtr client, + Mask access_mode); extern void GetXIDRange( int /*client*/, @@ -258,5 +244,34 @@ extern Atom *ResourceNames; void RegisterResourceName(RESTYPE type, char* name); #endif +/* + * These are deprecated compatibility functions and will be removed soon! + * Please use the noted replacements instead. + */ + +/* replaced by dixLookupResource */ +extern pointer SecurityLookupIDByType( + ClientPtr client, + XID id, + RESTYPE rtype, + Mask access_mode); + +/* replaced by dixLookupResource */ +extern pointer SecurityLookupIDByClass( + ClientPtr client, + XID id, + RESTYPE classes, + Mask access_mode); + +/* replaced by dixLookupResource */ +extern pointer LookupIDByType( + XID id, + RESTYPE rtype); + +/* replaced by dixLookupResource */ +extern pointer LookupIDByClass( + XID id, + RESTYPE classes); + #endif /* RESOURCE_H */ |