[PATCH evdev 3/3] Remove unused misc_label and val

Peter Hutterer peter.hutterer at who-t.net
Tue Jun 14 17:45:45 PDT 2011


evdev.c: In function 'EvdevInitAxesLabels':
evdev.c:2192:11: warning: variable 'misc_label' set but not used
[-Wunused-but-set-variable]
obsolete with 880ad1e19afd83ac115948b67d4049e16cb12df0

emuWheel.c: In function 'EvdevWheelEmuPreInit':
emuWheel.c:252:10: warning: variable 'val' set but not used
[-Wunused-but-set-variable]
obsolete with b0737bdbd1f6e601eb4984b6f4cb49279190984c

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/emuWheel.c |    4 ----
 src/evdev.c    |    3 ---
 2 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/src/emuWheel.c b/src/emuWheel.c
index 75df34d..ae894fa 100644
--- a/src/emuWheel.c
+++ b/src/emuWheel.c
@@ -249,14 +249,10 @@ void
 EvdevWheelEmuPreInit(InputInfoPtr pInfo)
 {
     EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
-    char val[4];
     int wheelButton;
     int inertia;
     int timeout;
 
-    val[0] = 0;
-    val[1] = 0;
-
     if (xf86SetBoolOption(pInfo->options, "EmulateWheel", FALSE)) {
 	pEvdev->emulateWheel.enabled = TRUE;
     } else
diff --git a/src/evdev.c b/src/evdev.c
index 8b01fb1..5a38f97 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -2189,18 +2189,15 @@ static void EvdevInitAxesLabels(EvdevPtr pEvdev, int natoms, Atom *atoms)
     int axis;
     char **labels;
     int labels_len = 0;
-    char *misc_label;
 
     if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS)
     {
         labels     = abs_labels;
         labels_len = ArrayLength(abs_labels);
-        misc_label = AXIS_LABEL_PROP_ABS_MISC;
     } else if ((pEvdev->flags & EVDEV_RELATIVE_EVENTS))
     {
         labels     = rel_labels;
         labels_len = ArrayLength(rel_labels);
-        misc_label = AXIS_LABEL_PROP_REL_MISC;
     }
 
     memset(atoms, 0, natoms * sizeof(Atom));
-- 
1.7.5.4



More information about the xorg-devel mailing list