../src/wcmConfig.c: In function 'wcmPreInit':
../src/wcmConfig.c:507:26: warning: assignment discards 'const' qualifier from
pointer target type [enabled by default]
Signed-off-by: Jason Gerecke <killert...@gmail.com>
---
src/wcmConfig.c | 2 +-
src/wcmValidateDevice.c | 2 +-
src/xf86Wacom.h | 2 +-
src/xf86WacomDefs.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/wcmConfig.c b/src/wcmConfig.c
index aeae119..31cc90a 100644
--- a/src/wcmConfig.c
+++ b/src/wcmConfig.c
@@ -481,7 +481,7 @@ static int wcmPreInit(InputDriverPtr drv, InputInfoPtr
pInfo, int flags)
WacomDevicePtr priv = NULL;
WacomCommonPtr common = NULL;
const char* type;
- char* device, *oldname;
+ const char* device, *oldname;
int need_hotplug = 0, is_dependent = 0;
gWacomModule.wcmDrv = drv;
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
index a0247ef..fac813e 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -78,7 +78,7 @@ static Bool wcmCheckSource(InputInfoPtr pInfo, dev_t min_maj)
* the xorg.conf and is then hotplugged through the server backend (HAL,
* udev). In this case, the hotplugged one fails.
*/
-int wcmIsDuplicate(char* device, InputInfoPtr pInfo)
+int wcmIsDuplicate(const char* device, InputInfoPtr pInfo)
{
struct stat st;
int isInUse = 0;
diff --git a/src/xf86Wacom.h b/src/xf86Wacom.h
index ca0bcf0..2e546eb 100644
--- a/src/xf86Wacom.h
+++ b/src/xf86Wacom.h
@@ -131,7 +131,7 @@ void wcmMappingFactor(InputInfoPtr pInfo);
/* validation */
extern Bool wcmIsAValidType(InputInfoPtr pInfo, const char* type);
extern Bool wcmIsWacomDevice (char* fname);
-extern int wcmIsDuplicate(char* device, InputInfoPtr pInfo);
+extern int wcmIsDuplicate(const char* device, InputInfoPtr pInfo);
extern int wcmDeviceTypeKeys(InputInfoPtr pInfo);
/* hotplug */
diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h
index f662131..4ae6fe7 100644
--- a/src/xf86WacomDefs.h
+++ b/src/xf86WacomDefs.h
@@ -411,7 +411,7 @@ enum WacomProtocol {
struct _WacomCommonRec
{
/* Do not move device_path, same offset as priv->name. Used by DBG
macro */
- char* device_path; /* device file name */
+ const char* device_path; /* device file name */
dev_t min_maj; /* minor/major number */
unsigned char wcmFlags; /* various flags (handle tilt) */
int debugLevel;
--
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
