summaryrefslogtreecommitdiff
path: root/Xi
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-11-15 06:00:44 -0800
committerKeith Packard <keithp@keithp.com>2014-01-12 10:14:50 -0800
commitfecc7eb1cf66db64728ee2d68cd9443df7e70879 (patch)
tree659d74fb9f18bcc8fc0a0774b71bfad3d8a050f2 /Xi
parentaf04cf6968b16cc9efd17905471047e7de62058a (diff)
xi: More warning cleanup for input
Lots more const char stuff. Remove duplicate defs of CoreKeyboardProc and CorePointerProc from test/xi2/protocol-common.c Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'Xi')
-rw-r--r--Xi/extinit.c4
-rw-r--r--Xi/listdev.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/Xi/extinit.c b/Xi/extinit.c
index a49a42152..c13bc475e 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -1169,8 +1169,8 @@ IResetProc(ExtensionEntry * unused)
EventSwapVector[DevicePropertyNotify] = NotImplemented;
RestoreExtensionEvents();
- free(xi_all_devices.name);
- free(xi_all_master_devices.name);
+ free((void *) xi_all_devices.name);
+ free((void *) xi_all_master_devices.name);
XIBarrierReset();
}
diff --git a/Xi/listdev.c b/Xi/listdev.c
index 014c61db0..470fb52ee 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -119,7 +119,7 @@ SizeDeviceInfo(DeviceIntPtr d, int *namesize, int *size)
*/
static void
-CopyDeviceName(char **namebuf, char *name)
+CopyDeviceName(char **namebuf, const char *name)
{
char *nameptr = (char *) *namebuf;