From c1dbd67f3b536a6e6bbdc4df278b1a934352e509 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Mon, 20 Jul 2015 03:27:09 +0200 Subject: [PATCH] Code cleanup Removes some dead assignments, an unused function, and uses %d format specifier for int. Signed-off-by: Thomas Hindoe Paaboel Andersen Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- src/evdev-mt-touchpad-buttons.c | 1 - test/gestures.c | 4 ---- test/litest.c | 4 ++-- test/pointer.c | 1 - tools/libinput-list-devices.c | 9 --------- 5 files changed, 2 insertions(+), 17 deletions(-) diff --git a/src/evdev-mt-touchpad-buttons.c b/src/evdev-mt-touchpad-buttons.c index 5ecdccd5..6aa74c31 100644 --- a/src/evdev-mt-touchpad-buttons.c +++ b/src/evdev-mt-touchpad-buttons.c @@ -971,7 +971,6 @@ tp_post_clickpadbutton_buttons(struct tp_dispatch *tp, uint64_t time) current = tp->buttons.state; old = tp->buttons.old_state; - button = 0; is_top = 0; if (!tp->buttons.click_pending && current == old) diff --git a/test/gestures.c b/test/gestures.c index 3d20bf29..8b6639f3 100644 --- a/test/gestures.c +++ b/test/gestures.c @@ -223,8 +223,6 @@ START_TEST(gestures_pinch) libinput_event_destroy(event); - dir_x = cardinals[cardinal][0]; - dir_y = cardinals[cardinal][1]; while ((event = libinput_get_event(li)) != NULL) { gevent = litest_is_gesture_event(event, LIBINPUT_EVENT_GESTURE_PINCH_UPDATE, @@ -324,8 +322,6 @@ START_TEST(gestures_spread) libinput_event_destroy(event); - dir_x = cardinals[cardinal][0]; - dir_y = cardinals[cardinal][1]; while ((event = libinput_get_event(li)) != NULL) { gevent = litest_is_gesture_event(event, LIBINPUT_EVENT_GESTURE_PINCH_UPDATE, diff --git a/test/litest.c b/test/litest.c index 1fa8f237..db93bbe8 100644 --- a/test/litest.c +++ b/test/litest.c @@ -214,13 +214,13 @@ litest_backtrace(void) } if (have_lineno) { - litest_log("%u: %s() (%s:%d)\n", + litest_log("%d: %s() (%s:%d)\n", i, procname, file, line); } else { - litest_log("%u: %s (%s%s+%#x) [%p]\n", + litest_log("%d: %s (%s%s+%#x) [%p]\n", i, filename, procname, diff --git a/test/pointer.c b/test/pointer.c index c781505f..c0a7392b 100644 --- a/test/pointer.c +++ b/test/pointer.c @@ -251,7 +251,6 @@ START_TEST(pointer_absolute_initial_state) struct libinput_event_pointer *p1, *p2; int axis = _i; /* looped test */ - dev = litest_current_device(); libinput1 = dev->libinput; litest_touch_down(dev, 0, 40, 60); litest_touch_up(dev, 0); diff --git a/tools/libinput-list-devices.c b/tools/libinput-list-devices.c index 6d162e2f..f9ce7e46 100644 --- a/tools/libinput-list-devices.c +++ b/tools/libinput-list-devices.c @@ -35,15 +35,6 @@ #include "shared.h" -static inline const char* -bool_to_str(bool b) -{ - if (b) - return "yes"; - else - return "no"; -} - static const char * tap_default(struct libinput_device *device) {