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>
This commit is contained in:
Keith Packard
2013-11-15 06:00:44 -08:00
parent af04cf6968
commit fecc7eb1cf
8 changed files with 26 additions and 28 deletions

View File

@@ -351,7 +351,7 @@ DuplicateInputAttributes(InputAttributes * attrs)
{
InputAttributes *new_attr;
int ntags = 0;
char **tags, **new_tags;
const char **tags, **new_tags;
if (!attrs)
return NULL;
@@ -403,20 +403,20 @@ DuplicateInputAttributes(InputAttributes * attrs)
void
FreeInputAttributes(InputAttributes * attrs)
{
char **tags;
const char **tags;
if (!attrs)
return;
free(attrs->product);
free(attrs->vendor);
free(attrs->device);
free(attrs->pnp_id);
free(attrs->usb_id);
free((void *) attrs->product);
free((void *) attrs->vendor);
free((void *) attrs->device);
free((void *) attrs->pnp_id);
free((void *) attrs->usb_id);
if ((tags = attrs->tags))
while (*tags)
free(*tags++);
free((void *) *tags++);
free(attrs->tags);
free(attrs);