diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-11-04 23:21:34 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-11-23 12:15:07 -0800 |
| commit | 05f589d464a961aea8d25632a390fb66a06cd186 (patch) | |
| tree | 76ed00ac377c882f2ba7f1c8f8f19926375d6aca /dix | |
| parent | 232f1ddf3d060f3ce9d2ebd35f33b1294cac380e (diff) | |
Fix gcc -Wwrite-strings warnings in various extensions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/devices.c | 2 | ||||
| -rw-r--r-- | dix/extension.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dix/devices.c b/dix/devices.c index da817a8af..37cbcdb78 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -2554,7 +2554,7 @@ GetMaster(DeviceIntPtr dev, int which) * the value for master. */ int -AllocDevicePair (ClientPtr client, char* name, +AllocDevicePair (ClientPtr client, const char* name, DeviceIntPtr* ptr, DeviceIntPtr* keybd, DeviceProc ptr_proc, diff --git a/dix/extension.c b/dix/extension.c index c7bbac5ff..53aaf051f 100644 --- a/dix/extension.c +++ b/dix/extension.c @@ -71,7 +71,7 @@ static int lastError = FirstExtensionError; static unsigned int NumExtensions = 0; ExtensionEntry * -AddExtension(char *name, int NumEvents, int NumErrors, +AddExtension(const char *name, int NumEvents, int NumErrors, int (*MainProc)(ClientPtr c1), int (*SwappedMainProc)(ClientPtr c2), void (*CloseDownProc)(ExtensionEntry *e), @@ -151,7 +151,7 @@ AddExtension(char *name, int NumEvents, int NumErrors, return ext; } -Bool AddExtensionAlias(char *alias, ExtensionEntry *ext) +Bool AddExtensionAlias(const char *alias, ExtensionEntry *ext) { char *name; char **aliases; @@ -172,7 +172,7 @@ Bool AddExtensionAlias(char *alias, ExtensionEntry *ext) } static int -FindExtension(char *extname, int len) +FindExtension(const char *extname, int len) { int i, j; @@ -201,7 +201,7 @@ CheckExtension(const char *extname) { int n; - n = FindExtension((char*)extname, strlen(extname)); + n = FindExtension(extname, strlen(extname)); if (n != -1) return extensions[n]; else |