Hi, On 01/30/2014 12:51 AM, Peter Hutterer wrote: > This reverts commit f71de60355cc76810657f40c7b5461af86b34bf7. > > What warnings? > > Signed-off-by: Peter Hutterer <[email protected]>
Looks good: Reviewed By: Hans de Goede <[email protected]> Regards, Hans > --- > hw/xfree86/parser/InputClass.c | 24 ++++++++++++------------ > hw/xfree86/parser/xf86Parser.h | 2 +- > 2 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/hw/xfree86/parser/InputClass.c b/hw/xfree86/parser/InputClass.c > index 24a1246..c2fbd22 100644 > --- a/hw/xfree86/parser/InputClass.c > +++ b/hw/xfree86/parser/InputClass.c > @@ -63,7 +63,7 @@ xf86ConfigSymTabRec InputClassTab[] = { > #define TOKEN_SEP "|" > > static void > -add_group_entry(struct xorg_list *head, const char **values) > +add_group_entry(struct xorg_list *head, char **values) > { > xf86MatchGroup *group; > > @@ -256,7 +256,7 @@ void > xf86printInputClassSection(FILE * cf, XF86ConfInputClassPtr ptr) > { > const xf86MatchGroup *group; > - const char *const *cur; > + char *const *cur; > > while (ptr) { > fprintf(cf, "Section \"InputClass\"\n"); > @@ -362,7 +362,7 @@ xf86freeInputClassList(XF86ConfInputClassPtr ptr) > > while (ptr) { > xf86MatchGroup *group, *next; > - const char **list; > + char **list; > > TestFree(ptr->identifier); > TestFree(ptr->driver); > @@ -370,55 +370,55 @@ xf86freeInputClassList(XF86ConfInputClassPtr ptr) > xorg_list_for_each_entry_safe(group, next, &ptr->match_product, > entry) { > xorg_list_del(&group->entry); > for (list = group->values; *list; list++) > - free((void *) *list); > + free(*list); > free(group); > } > xorg_list_for_each_entry_safe(group, next, &ptr->match_vendor, > entry) { > xorg_list_del(&group->entry); > for (list = group->values; *list; list++) > - free((void *) *list); > + free(*list); > free(group); > } > xorg_list_for_each_entry_safe(group, next, &ptr->match_device, > entry) { > xorg_list_del(&group->entry); > for (list = group->values; *list; list++) > - free((void *) *list); > + free(*list); > free(group); > } > xorg_list_for_each_entry_safe(group, next, &ptr->match_os, entry) { > xorg_list_del(&group->entry); > for (list = group->values; *list; list++) > - free((void *) *list); > + free(*list); > free(group); > } > xorg_list_for_each_entry_safe(group, next, &ptr->match_pnpid, entry) > { > xorg_list_del(&group->entry); > for (list = group->values; *list; list++) > - free((void *) *list); > + free(*list); > free(group); > } > xorg_list_for_each_entry_safe(group, next, &ptr->match_usbid, entry) > { > xorg_list_del(&group->entry); > for (list = group->values; *list; list++) > - free((void *) *list); > + free(*list); > free(group); > } > xorg_list_for_each_entry_safe(group, next, &ptr->match_driver, > entry) { > xorg_list_del(&group->entry); > for (list = group->values; *list; list++) > - free((void *) *list); > + free(*list); > free(group); > } > xorg_list_for_each_entry_safe(group, next, &ptr->match_tag, entry) { > xorg_list_del(&group->entry); > for (list = group->values; *list; list++) > - free((void *) *list); > + free(*list); > free(group); > } > xorg_list_for_each_entry_safe(group, next, &ptr->match_layout, > entry) { > xorg_list_del(&group->entry); > for (list = group->values; *list; list++) > - free((void *) *list); > + free(*list); > free(group); > } > > diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h > index 83607f2..0fcf405 100644 > --- a/hw/xfree86/parser/xf86Parser.h > +++ b/hw/xfree86/parser/xf86Parser.h > @@ -299,7 +299,7 @@ typedef struct { > > typedef struct { > struct xorg_list entry; > - const char **values; > + char **values; > } xf86MatchGroup; > > typedef struct { > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
