[PATCH 3/6] xfree86: unconstify another string

Peter Hutterer peter.hutterer at who-t.net
Tue Feb 4 21:18:18 PST 2014


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 at who-t.net>
---
 hw/xfree86/common/xf86Configure.c | 4 ++--
 hw/xfree86/parser/xf86Parser.h    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 5fc1399..6aaf634 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -337,7 +337,7 @@ configureLayoutSection(void)
         iptr = malloc(sizeof(XF86ConfInputrefRec));
         iptr->list.next = NULL;
         iptr->iref_option_lst = NULL;
-        iptr->iref_inputdev_str = "Mouse0";
+        iptr->iref_inputdev_str = strdup("Mouse0");
         iptr->iref_option_lst =
             xf86addNewOption(iptr->iref_option_lst, strdup("CorePointer"),
                              NULL);
@@ -351,7 +351,7 @@ configureLayoutSection(void)
         iptr = malloc(sizeof(XF86ConfInputrefRec));
         iptr->list.next = NULL;
         iptr->iref_option_lst = NULL;
-        iptr->iref_inputdev_str = "Keyboard0";
+        iptr->iref_inputdev_str = strdup("Keyboard0");
         iptr->iref_option_lst =
             xf86addNewOption(iptr->iref_option_lst, strdup("CoreKeyboard"),
                              NULL);
diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h
index 2871edd..d352d4b 100644
--- a/hw/xfree86/parser/xf86Parser.h
+++ b/hw/xfree86/parser/xf86Parser.h
@@ -288,7 +288,7 @@ typedef struct {
 typedef struct {
     GenericListRec list;
     XF86ConfInputPtr iref_inputdev;
-    const char *iref_inputdev_str;
+    char *iref_inputdev_str;
     XF86OptionPtr iref_option_lst;
 } XF86ConfInputrefRec, *XF86ConfInputrefPtr;
 
-- 
1.8.4.2



More information about the xorg-devel mailing list