diff options
| -rw-r--r-- | dix/registry.c | 5 | ||||
| -rw-r--r-- | dix/resource.c | 2 | ||||
| -rw-r--r-- | include/registry.h | 2 | ||||
| -rw-r--r-- | include/resource.h | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/dix/registry.c b/dix/registry.c index fc35dbbc7..5ab25ad70 100644 --- a/dix/registry.c +++ b/dix/registry.c @@ -41,7 +41,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. static FILE *fh; -static char ***requests, **events, **errors, **resources; +static char ***requests, **events, **errors; +static const char **resources; static unsigned nmajor, *nminor, nevent, nerror, nresource; /* @@ -197,7 +198,7 @@ RegisterExtensionNames(ExtensionEntry *extEntry) */ void -RegisterResourceName(RESTYPE resource, char *name) +RegisterResourceName(RESTYPE resource, const char *name) { resource &= TypeMask; diff --git a/dix/resource.c b/dix/resource.c index eb9f0492a..be8a8f81b 100644 --- a/dix/resource.c +++ b/dix/resource.c @@ -242,7 +242,7 @@ CallResourceStateCallback(ResourceState state, ResourceRec *res) } RESTYPE -CreateNewResourceType(DeleteType deleteFunc, char *name) +CreateNewResourceType(DeleteType deleteFunc, const char *name) { RESTYPE next = lastResourceType + 1; struct ResourceType *types; diff --git a/include/registry.h b/include/registry.h index 325f76515..44f79259e 100644 --- a/include/registry.h +++ b/include/registry.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Registration functions. The name string is not copied, so it must * not be a stack variable. */ -extern _X_EXPORT void RegisterResourceName(RESTYPE type, char *name); +extern _X_EXPORT void RegisterResourceName(RESTYPE type, const char *name); extern _X_EXPORT void RegisterExtensionNames(ExtensionEntry *ext); /* diff --git a/include/resource.h b/include/resource.h index 772b7b877..5da281913 100644 --- a/include/resource.h +++ b/include/resource.h @@ -157,7 +157,7 @@ typedef Bool (*FindComplexResType)( pointer /*cdata*/); extern _X_EXPORT RESTYPE CreateNewResourceType( - DeleteType /*deleteFunc*/, char * /*name*/); + DeleteType /*deleteFunc*/, const char * /*name*/); extern _X_EXPORT void SetResourceTypeErrorValue( RESTYPE /*type*/, int /*errorValue*/); |