frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alan Coopersmith 2011-12-12 16:49:33 -08:00
parent 424dbde891
commit 2ddae8f0bd
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dix/registry.c
View File

@ -41,7 +41,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
static FILE *fh; 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; static unsigned nmajor, *nminor, nevent, nerror, nresource;
/* /*
@ -197,7 +198,7 @@ RegisterExtensionNames(ExtensionEntry *extEntry)
*/ */
void void
RegisterResourceName(RESTYPE resource, char *name) RegisterResourceName(RESTYPE resource, const char *name)
{ {
resource &= TypeMask; resource &= TypeMask;

2
dix/resource.c
View File

@ -242,7 +242,7 @@ CallResourceStateCallback(ResourceState state, ResourceRec *res)
} }
RESTYPE RESTYPE
CreateNewResourceType(DeleteType deleteFunc, char *name) CreateNewResourceType(DeleteType deleteFunc, const char *name)
{ {
RESTYPE next = lastResourceType + 1; RESTYPE next = lastResourceType + 1;
struct ResourceType *types; struct ResourceType *types;

2
include/registry.h
View File

@ -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 * Registration functions. The name string is not copied, so it must
* not be a stack variable. * 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); extern _X_EXPORT void RegisterExtensionNames(ExtensionEntry *ext);
/* /*

2
include/resource.h
View File

@ -157,7 +157,7 @@ typedef Bool (*FindComplexResType)(
pointer /*cdata*/); pointer /*cdata*/);
extern _X_EXPORT RESTYPE CreateNewResourceType( extern _X_EXPORT RESTYPE CreateNewResourceType(
DeleteType /*deleteFunc*/, char * /*name*/); DeleteType /*deleteFunc*/, const char * /*name*/);
extern _X_EXPORT void SetResourceTypeErrorValue( extern _X_EXPORT void SetResourceTypeErrorValue(
RESTYPE /*type*/, int /*errorValue*/); RESTYPE /*type*/, int /*errorValue*/);