aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-05-25 14:04:22 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-06-08 09:12:14 +1000
commit61faf2e6e70a4c9ecffe638d46829738dc2e3452 (patch)
tree7c573c18a95934d6f820353f6da73a88a6a13da5
parentUse xf86IDrvMsg in emuMB.c instead of ErrorF (diff)
downloadxf86-input-evdev-61faf2e6e70a4c9ecffe638d46829738dc2e3452.tar.gz
xf86-input-evdev-61faf2e6e70a4c9ecffe638d46829738dc2e3452.tar.bz2
xf86-input-evdev-61faf2e6e70a4c9ecffe638d46829738dc2e3452.zip
strtol doesn't need a empty string, NULL is good enough.
Fixes: evdev.c: In function 'EvdevInitButtonMapping': evdev.c:1659:25: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
-rw-r--r--src/evdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/evdev.c b/src/evdev.c
index a628273..055bc3f 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1660,7 +1660,7 @@ EvdevInitButtonMapping(InputInfoPtr pInfo)
/* Check for user-defined button mapping */
if ((mapping = xf86CheckStrOption(pInfo->options, "ButtonMapping", NULL)))
{
- char *map, *s = " ";
+ char *map, *s = NULL;
int btn = 0;
xf86IDrvMsg(pInfo, X_CONFIG, "ButtonMapping '%s'\n", mapping);