../src/wcmConfig.c: In function 'wcmIsHotpluggedDevice':
../src/wcmConfig.c:442:2: warning: passing argument 3 of 'xf86CheckStrOption' 
discards 'const' qualifier from pointer target type
[enabled by default]
In file included from /usr/include/xorg/xf86str.h:43:0,
                 from /usr/include/xorg/xf86.h:44,
                 from ../src/xf86Wacom.h:33,
                 from ../src/wcmConfig.c:24:
/usr/include/xorg/xf86Opt.h:87:24: note: expected 'char *' but argument is of 
type 'const char *'

Signed-off-by: Jason Gerecke <killert...@gmail.com>
---
 src/wcmConfig.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wcmConfig.c b/src/wcmConfig.c
index 31cc90a..e7fea5b 100644
--- a/src/wcmConfig.c
+++ b/src/wcmConfig.c
@@ -439,8 +439,8 @@ static void wcmLinkTouchAndPen(InputInfoPtr pInfo)
  */
 static int wcmIsHotpluggedDevice(InputInfoPtr pInfo)
 {
-       char *source = xf86CheckStrOption(pInfo->options, "_source", "");
-       return !strcmp(source, "_driver/wacom");
+       char *source = xf86CheckStrOption(pInfo->options, "_source", NULL);
+       return (!source || !strcmp(source, "_driver/wacom"));
 }
 
 /* wcmPreInit - called for each input devices with the driver set to
-- 
1.7.10.2


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to