diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-12-12 16:49:33 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-12-12 17:03:08 -0800 |
| commit | 2ddae8f0bd2a9ce0cd15bf3848393af29e615acf (patch) | |
| tree | 98bf0ad72f09e0968bc6e8ef451dd2ce086d2d98 /dix | |
| parent | 424dbde891486ad6a6c00c61a334031ff18f5556 (diff) | |
constify strings in resource name registry
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>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/registry.c | 5 | ||||
| -rw-r--r-- | dix/resource.c | 2 |
2 files changed, 4 insertions, 3 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; |