2ddae8f0bd
LookupResourceName already returned a const char *, so just needed to change the variable we're storing the list in to be a const char ** and then add const to the name argument to RegisterResourceName (which just stores name in the array) and CreateNewResourceType (which just passes name to RegisterResourceName). Clears a bunch of gcc warnings of the form: registry.c:319:5: warning: passing argument 2 of 'RegisterResourceName' discards qualifiers from pointer target type registry.c:200:1: note: expected 'char *' but argument is of type 'const char *' and from all the extensions: damageext.c: In function 'DamageExtensionInit': damageext.c:490:5: warning: passing argument 2 of 'CreateNewResourceType' discards qualifiers from pointer target type ../include/resource.h:159:26: note: expected 'char *' but argument is of type 'const char *' Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
65 lines
2.0 KiB
C
65 lines
2.0 KiB
C
/***********************************************************
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
|
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
******************************************************************/
|
|
|
|
#ifndef DIX_REGISTRY_H
|
|
#define DIX_REGISTRY_H
|
|
|
|
/*
|
|
* Result returned from any unsuccessful lookup
|
|
*/
|
|
#define XREGISTRY_UNKNOWN "<unknown>"
|
|
|
|
#ifdef XREGISTRY
|
|
|
|
#include "resource.h"
|
|
#include "extnsionst.h"
|
|
|
|
/* Internal string registry - for auditing, debugging, security, etc. */
|
|
|
|
/*
|
|
* Registration functions. The name string is not copied, so it must
|
|
* not be a stack variable.
|
|
*/
|
|
extern _X_EXPORT void RegisterResourceName(RESTYPE type, const char *name);
|
|
extern _X_EXPORT void RegisterExtensionNames(ExtensionEntry *ext);
|
|
|
|
/*
|
|
* Lookup functions. The returned string must not be modified or freed.
|
|
*/
|
|
extern _X_EXPORT const char *LookupMajorName(int major);
|
|
extern _X_EXPORT const char *LookupRequestName(int major, int minor);
|
|
extern _X_EXPORT const char *LookupEventName(int event);
|
|
extern _X_EXPORT const char *LookupErrorName(int error);
|
|
extern _X_EXPORT const char *LookupResourceName(RESTYPE rtype);
|
|
|
|
/*
|
|
* Setup and teardown
|
|
*/
|
|
extern _X_EXPORT void dixResetRegistry(void);
|
|
|
|
#else /* XREGISTRY */
|
|
|
|
/* Define calls away when the registry is not being built. */
|
|
|
|
#define RegisterResourceName(a, b) { ; }
|
|
#define RegisterExtensionNames(a) { ; }
|
|
|
|
#define LookupMajorName(a) XREGISTRY_UNKNOWN
|
|
#define LookupRequestName(a, b) XREGISTRY_UNKNOWN
|
|
#define LookupEventName(a) XREGISTRY_UNKNOWN
|
|
#define LookupErrorName(a) XREGISTRY_UNKNOWN
|
|
#define LookupResourceName(a) XREGISTRY_UNKNOWN
|
|
|
|
#define dixResetRegistry() { ; }
|
|
|
|
#endif /* XREGISTRY */
|
|
#endif /* DIX_REGISTRY_H */
|