aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Slusarz <marcin.slusarz@gmail.com>2012-05-21 01:22:33 +0200
committerPeter Hutterer <peter.hutterer@who-t.net>2012-05-21 16:53:36 +1000
commit2c8da280b3ab635d049784345d025d289348687b (patch)
treecc5dad2c1f882d3295a48b377b13dfdc76894a88
parentDevices configured as mice need REL_X/Y (diff)
downloadxf86-input-evdev-2c8da280b3ab635d049784345d025d289348687b.tar.gz
xf86-input-evdev-2c8da280b3ab635d049784345d025d289348687b.tar.bz2
xf86-input-evdev-2c8da280b3ab635d049784345d025d289348687b.zip
Fix some obvious constness-related compile warnings.
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/emuWheel.c4
-rw-r--r--src/evdev.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/src/emuWheel.c b/src/emuWheel.c
index ae894fa..db989c5 100644
--- a/src/emuWheel.c
+++ b/src/emuWheel.c
@@ -51,7 +51,6 @@ static Atom prop_wheel_timeout = 0;
static Atom prop_wheel_button = 0;
/* Local Funciton Prototypes */
-static BOOL EvdevWheelEmuHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr pAxis, char *axis_name);
static int EvdevWheelEmuInertia(InputInfoPtr pInfo, WheelAxisPtr axis, int value);
/* Filter mouse button events */
@@ -197,7 +196,8 @@ EvdevWheelEmuInertia(InputInfoPtr pInfo, WheelAxisPtr axis, int value)
/* Handle button mapping here to avoid code duplication,
returns true if a button mapping was found. */
static BOOL
-EvdevWheelEmuHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr pAxis, char* axis_name)
+EvdevWheelEmuHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr pAxis,
+ const char *axis_name)
{
EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
char *option_string;
diff --git a/src/evdev.c b/src/evdev.c
index 140a633..feb018c 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -277,7 +277,7 @@ EvdevRemoveDevice(InputInfoPtr pInfo)
static void
-SetXkbOption(InputInfoPtr pInfo, char *name, char **option)
+SetXkbOption(InputInfoPtr pInfo, const char *name, char **option)
{
char *s;
@@ -2547,7 +2547,7 @@ EvdevUtilButtonEventToButtonNumber(EvdevPtr pEvdev, int code)
/* Aligned with linux/input.h.
Note that there are holes in the ABS_ range, these are simply replaced with
MISC here */
-static char* abs_labels[] = {
+static const char *abs_labels[] = {
AXIS_LABEL_PROP_ABS_X, /* 0x00 */
AXIS_LABEL_PROP_ABS_Y, /* 0x01 */
AXIS_LABEL_PROP_ABS_Z, /* 0x02 */
@@ -2610,7 +2610,7 @@ static char* abs_labels[] = {
AXIS_LABEL_PROP_ABS_MT_PRESSURE, /* 0x3a */
};
-static char* rel_labels[] = {
+static const char *rel_labels[] = {
AXIS_LABEL_PROP_REL_X,
AXIS_LABEL_PROP_REL_Y,
AXIS_LABEL_PROP_REL_Z,
@@ -2623,7 +2623,7 @@ static char* rel_labels[] = {
AXIS_LABEL_PROP_REL_MISC
};
-static char* btn_labels[][16] = {
+static const char *btn_labels[][16] = {
{ /* BTN_MISC group offset 0x100*/
BTN_LABEL_PROP_BTN_0, /* 0x00 */
BTN_LABEL_PROP_BTN_1, /* 0x01 */
@@ -2708,7 +2708,7 @@ static void EvdevInitAxesLabels(EvdevPtr pEvdev, int mode, int natoms, Atom *ato
{
Atom atom;
int axis;
- char **labels;
+ const char **labels;
int labels_len = 0;
if (mode == Absolute)