diff options
| author | marha <marha@users.sourceforge.net> | 2010-08-18 10:36:39 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-08-18 10:36:39 +0000 |
| commit | 07d3578ce63d87c9a87d54d85f5c8057d30fdc58 (patch) | |
| tree | d8acfcb63e11aa7f91c1d9685b5c2f55cd7133c7 /xorg-server/hw/xfree86/parser | |
| parent | 4d025671124c9f6d91c1c165fc892b1609fdce12 (diff) | |
| parent | 2aa7bcf37f00b7884ae166d62db81493ea37934a (diff) | |
| download | vcxsrv-07d3578ce63d87c9a87d54d85f5c8057d30fdc58.tar.gz vcxsrv-07d3578ce63d87c9a87d54d85f5c8057d30fdc58.tar.bz2 vcxsrv-07d3578ce63d87c9a87d54d85f5c8057d30fdc58.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/parser')
| -rw-r--r-- | xorg-server/hw/xfree86/parser/Input.c | 7 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/parser/InputClass.c | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/xorg-server/hw/xfree86/parser/Input.c b/xorg-server/hw/xfree86/parser/Input.c index 8adbee9ae..739e49ba4 100644 --- a/xorg-server/hw/xfree86/parser/Input.c +++ b/xorg-server/hw/xfree86/parser/Input.c @@ -59,6 +59,7 @@ #include <xorg-config.h>
#endif
+#include "os.h"
#include "xf86Parser.h"
#include "xf86tokens.h"
#include "Configint.h"
@@ -102,8 +103,10 @@ xf86parseInputSection (void) case DRIVER:
if (xf86getSubToken (&(ptr->inp_comment)) != STRING)
Error (QUOTE_MSG, "Driver");
- if (strcmp(val.str, "keyboard") == 0)
- ptr->inp_driver = "kbd";
+ if (strcmp(val.str, "keyboard") == 0) {
+ ptr->inp_driver = strdup("kbd");
+ free(val.str);
+ }
else
ptr->inp_driver = val.str;
break;
diff --git a/xorg-server/hw/xfree86/parser/InputClass.c b/xorg-server/hw/xfree86/parser/InputClass.c index 85161c38a..ddf344a0f 100644 --- a/xorg-server/hw/xfree86/parser/InputClass.c +++ b/xorg-server/hw/xfree86/parser/InputClass.c @@ -111,8 +111,10 @@ xf86parseInputClassSection(void) case DRIVER:
if (xf86getSubToken(&(ptr->comment)) != STRING)
Error(QUOTE_MSG, "Driver");
- if (strcmp(val.str, "keyboard") == 0)
- ptr->driver = "kbd";
+ if (strcmp(val.str, "keyboard") == 0) {
+ ptr->driver = strdup("kbd");
+ free(val.str);
+ }
else
ptr->driver = val.str;
break;
|