Revert "xfree86/parser: make strings in xf86MatchGroup const"
This reverts commit f71de60355
.
What warnings?
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
parent
45f1d527f3
commit
a553444b58
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -299,7 +299,7 @@ typedef struct {
|
|||
|
||||
typedef struct {
|
||||
struct xorg_list entry;
|
||||
const char **values;
|
||||
char **values;
|
||||
} xf86MatchGroup;
|
||||
|
||||
typedef struct {
|
||||
|
|
Loading…
Reference in New Issue
Block a user