frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: unconstify another string 

Only Xorg -configure uses a hardcoded value here, so let's not change the rest
of the server for that.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Peter Hutterer 2014-02-05 14:30:50 +10:00
parent 46ae9d67e4
commit f14d6647c0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/common/xf86Configure.c
View File

@ -337,7 +337,7 @@ configureLayoutSection(void)
iptr = malloc(sizeof(XF86ConfInputrefRec)); iptr = malloc(sizeof(XF86ConfInputrefRec));
iptr->list.next = NULL; iptr->list.next = NULL;
iptr->iref_option_lst = NULL; iptr->iref_option_lst = NULL;
iptr->iref_inputdev_str = "Mouse0"; iptr->iref_inputdev_str = strdup("Mouse0");
iptr->iref_option_lst = iptr->iref_option_lst =
xf86addNewOption(iptr->iref_option_lst, strdup("CorePointer"), xf86addNewOption(iptr->iref_option_lst, strdup("CorePointer"),
NULL); NULL);
@ -351,7 +351,7 @@ configureLayoutSection(void)
iptr = malloc(sizeof(XF86ConfInputrefRec)); iptr = malloc(sizeof(XF86ConfInputrefRec));
iptr->list.next = NULL; iptr->list.next = NULL;
iptr->iref_option_lst = NULL; iptr->iref_option_lst = NULL;
iptr->iref_inputdev_str = "Keyboard0"; iptr->iref_inputdev_str = strdup("Keyboard0");
iptr->iref_option_lst = iptr->iref_option_lst =
xf86addNewOption(iptr->iref_option_lst, strdup("CoreKeyboard"), xf86addNewOption(iptr->iref_option_lst, strdup("CoreKeyboard"),
NULL); NULL);

2
hw/xfree86/parser/xf86Parser.h
View File

@ -288,7 +288,7 @@ typedef struct {
typedef struct { typedef struct {
GenericListRec list; GenericListRec list;
XF86ConfInputPtr iref_inputdev; XF86ConfInputPtr iref_inputdev;
const char *iref_inputdev_str; char *iref_inputdev_str;
XF86OptionPtr iref_option_lst; XF86OptionPtr iref_option_lst;
} XF86ConfInputrefRec, *XF86ConfInputrefPtr; } XF86ConfInputrefRec, *XF86ConfInputrefPtr;