From 4160d94bafd3b658f1c04b90b5a3e4e7b8e3be40 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 4 Mar 2015 08:37:22 +1000 Subject: [PATCH] cosmetic: fix a couple of duplicate/missing empty lines Signed-off-by: Peter Hutterer --- libevdev/libevdev-int.h | 3 --- libevdev/libevdev-uinput-int.h | 1 - libevdev/libevdev-uinput.c | 2 -- libevdev/libevdev-util.h | 1 - libevdev/libevdev.c | 4 ---- libevdev/libevdev.h | 8 +++++--- test/test-common-uinput.h | 1 - test/test-common.h | 1 - test/test-event-names.c | 1 - test/test-int-queue.c | 1 - test/test-libevdev-events.c | 6 ------ test/test-libevdev-has-event.c | 3 --- test/test-libevdev-init.c | 1 - tools/libevdev-tweak-device.c | 1 - tools/touchpad-edge-detector.c | 1 - 15 files changed, 5 insertions(+), 30 deletions(-) diff --git a/libevdev/libevdev-int.h b/libevdev/libevdev-int.h index 372db53..e1c7ec5 100644 --- a/libevdev/libevdev-int.h +++ b/libevdev/libevdev-int.h @@ -181,7 +181,6 @@ queue_peek(struct libevdev *dev, size_t idx, struct input_event *ev) return 0; } - /** * Shift the first n elements into ev and return the number of elements * shifted. @@ -293,7 +292,6 @@ queue_set_num_elements(struct libevdev *dev, size_t nelem) max = libevdev_event_type_get_max(type); \ break; - static inline int type_to_mask_const(const struct libevdev *dev, unsigned int type, const unsigned long **mask) { @@ -342,4 +340,3 @@ type_to_mask(struct libevdev *dev, unsigned int type, unsigned long **mask) #undef max_mask #endif - diff --git a/libevdev/libevdev-uinput-int.h b/libevdev/libevdev-uinput-int.h index fbc1c29..22d1684 100644 --- a/libevdev/libevdev-uinput-int.h +++ b/libevdev/libevdev-uinput-int.h @@ -20,7 +20,6 @@ * OF THIS SOFTWARE. */ - struct libevdev_uinput { int fd; /**< file descriptor to uinput */ int fd_is_managed; /**< do we need to close it? */ diff --git a/libevdev/libevdev-uinput.c b/libevdev/libevdev-uinput.c index d115b53..ba323ed 100644 --- a/libevdev/libevdev-uinput.c +++ b/libevdev/libevdev-uinput.c @@ -271,8 +271,6 @@ fetch_syspath_and_devnode(struct libevdev_uinput *uinput_dev) return uinput_dev->devnode ? 0 : -1; } - - LIBEVDEV_EXPORT int libevdev_uinput_create_from_device(const struct libevdev *dev, int fd, struct libevdev_uinput** uinput_dev) { diff --git a/libevdev/libevdev-util.h b/libevdev/libevdev-util.h index 31c1a14..c6e1197 100644 --- a/libevdev/libevdev-util.h +++ b/libevdev/libevdev-util.h @@ -45,7 +45,6 @@ _a > _b ? _a : _b; \ }) - static inline bool startswith(const char *str, size_t len, const char *prefix, size_t plen) { diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c index 4c1eb10..f4aafa2 100644 --- a/libevdev/libevdev.c +++ b/libevdev/libevdev.c @@ -160,7 +160,6 @@ _libevdev_log_msg(const struct libevdev *dev, else if (unlikely(log_data.device_handler)) abort(); /* Seppuku, see above */ - va_start(args, format); if (dev && dev->log.device_handler) dev->log.device_handler(dev, priority, dev->log.userdata, file, line, func, format, args); @@ -682,7 +681,6 @@ sync_mt_state(struct libevdev *dev, int create_events) set_bit(slot_update, AXISBIT(slot, ABS_MT_SLOT)); } - } } @@ -1050,7 +1048,6 @@ libevdev_next_event(struct libevdev *dev, unsigned int flags, struct input_event goto out; } - if (queue_shift(dev, ev) != 0) return -EAGAIN; @@ -1136,7 +1133,6 @@ STRING_SETTER(name) STRING_SETTER(phys) STRING_SETTER(uniq) - #define PRODUCT_GETTER(name) \ LIBEVDEV_EXPORT int libevdev_get_id_##name(const struct libevdev *dev) \ { \ diff --git a/libevdev/libevdev.h b/libevdev/libevdev.h index b6f2f45..fc3e550 100644 --- a/libevdev/libevdev.h +++ b/libevdev/libevdev.h @@ -1032,7 +1032,6 @@ int libevdev_change_fd(struct libevdev* dev, int fd); */ int libevdev_get_fd(const struct libevdev* dev); - /** * @ingroup events */ @@ -1054,6 +1053,7 @@ enum libevdev_read_status { */ LIBEVDEV_READ_STATUS_SYNC = 1 }; + /** * @ingroup events * @@ -1385,6 +1385,7 @@ int libevdev_has_event_code(const struct libevdev *dev, unsigned int type, unsig * @note This function is signal-safe. */ int libevdev_get_abs_minimum(const struct libevdev *dev, unsigned int code); + /** * @ingroup bits * @@ -1398,6 +1399,7 @@ int libevdev_get_abs_minimum(const struct libevdev *dev, unsigned int code); * @note This function is signal-safe. */ int libevdev_get_abs_maximum(const struct libevdev *dev, unsigned int code); + /** * @ingroup bits * @@ -1411,6 +1413,7 @@ int libevdev_get_abs_maximum(const struct libevdev *dev, unsigned int code); * @note This function is signal-safe. */ int libevdev_get_abs_fuzz(const struct libevdev *dev, unsigned int code); + /** * @ingroup bits * @@ -1424,6 +1427,7 @@ int libevdev_get_abs_fuzz(const struct libevdev *dev, unsigned int code); * @note This function is signal-safe. */ int libevdev_get_abs_flat(const struct libevdev *dev, unsigned int code); + /** * @ingroup bits * @@ -1851,7 +1855,6 @@ int libevdev_disable_event_code(struct libevdev *dev, unsigned int type, unsigne */ int libevdev_kernel_set_abs_info(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs); - /** * @ingroup kernel */ @@ -2147,7 +2150,6 @@ int libevdev_property_from_name_n(const char *name, size_t len); */ int libevdev_get_repeat(const struct libevdev *dev, int *delay, int *period); - /********* DEPRECATED SECTION *********/ #if defined(__GNUC__) && __GNUC__ >= 4 #define LIBEVDEV_DEPRECATED __attribute__ ((deprecated)) diff --git a/test/test-common-uinput.h b/test/test-common-uinput.h index 6273a6d..2941134 100644 --- a/test/test-common-uinput.h +++ b/test/test-common-uinput.h @@ -25,7 +25,6 @@ #define DEFAULT_IDS NULL - struct uinput_device* uinput_device_new(const char *name); int uinput_device_new_with_events(struct uinput_device **dev, const char *name, const struct input_id *ids, ...); int uinput_device_new_with_events_v(struct uinput_device **dev, const char *name, const struct input_id *ids, va_list args); diff --git a/test/test-common.h b/test/test-common.h index d7a33d0..95436fc 100644 --- a/test/test-common.h +++ b/test/test-common.h @@ -32,7 +32,6 @@ #include "test-common-uinput.h" - int test_create_device(struct uinput_device **uidev, struct libevdev **dev, ...); diff --git a/test/test-event-names.c b/test/test-event-names.c index 8d7e6d6..10a59ea 100644 --- a/test/test-event-names.c +++ b/test/test-event-names.c @@ -298,4 +298,3 @@ event_name_suite(void) return s; } - diff --git a/test/test-int-queue.c b/test/test-int-queue.c index d45fee0..501dc08 100644 --- a/test/test-int-queue.c +++ b/test/test-int-queue.c @@ -357,4 +357,3 @@ queue_suite(void) return s; } - diff --git a/test/test-libevdev-events.c b/test/test-libevdev-events.c index 0f99b20..c950959 100644 --- a/test/test-libevdev-events.c +++ b/test/test-libevdev-events.c @@ -533,7 +533,6 @@ START_TEST(test_syn_delta_mt) abs[3].value = ABS_MT_POSITION_Y; abs[3].maximum = 1000; - abs[4].value = ABS_MT_SLOT; abs[4].maximum = 1; abs[5].value = ABS_MT_TRACKING_ID; @@ -648,7 +647,6 @@ START_TEST(test_syn_delta_mt_reset_slot) abs[3].value = ABS_MT_POSITION_Y; abs[3].maximum = 1000; - abs[4].value = ABS_MT_SLOT; abs[4].maximum = 1; abs[5].value = ABS_MT_TRACKING_ID; @@ -1109,7 +1107,6 @@ START_TEST(test_syn_delta_late_sync) } } - /* Now we basically re-do the exact same test, just with the tracking ID order inverted */ @@ -1193,7 +1190,6 @@ START_TEST(test_syn_delta_late_sync) } } - uinput_device_free(uidev); libevdev_free(dev); } @@ -1500,7 +1496,6 @@ START_TEST(test_event_values_invalid) ck_assert_int_eq(libevdev_fetch_event_value(dev, EV_REL, REL_Z, &value), 0); ck_assert_int_eq(value, 0xab); - uinput_device_free(uidev); libevdev_free(dev); @@ -2168,4 +2163,3 @@ libevdev_events(void) return s; } - diff --git a/test/test-libevdev-has-event.c b/test/test-libevdev-has-event.c index 857ef41..7703206 100644 --- a/test/test-libevdev-has-event.c +++ b/test/test-libevdev-has-event.c @@ -262,7 +262,6 @@ START_TEST(test_input_props) rc = libevdev_new_from_fd(uinput_device_get_fd(uidev), &dev); ck_assert_msg(rc == 0, "Failed to create device: %s", strerror(-rc)); - for (i = 0; i < INPUT_PROP_CNT; i++) { if (i == INPUT_PROP_DIRECT || i == INPUT_PROP_BUTTONPAD) ck_assert_int_eq(libevdev_has_property(dev, i), 1); @@ -577,7 +576,6 @@ START_TEST(test_device_get_abs_info) uidev = uinput_device_new(TEST_DEVICE_NAME); ck_assert(uidev != NULL); - abs.minimum = 0; abs.maximum = 1000; abs.fuzz = 1; @@ -1202,4 +1200,3 @@ libevdev_has_event_test(void) return s; } - diff --git a/test/test-libevdev-init.c b/test/test-libevdev-init.c index 62f539f..f673a58 100644 --- a/test/test-libevdev-init.c +++ b/test/test-libevdev-init.c @@ -529,7 +529,6 @@ START_TEST(test_set_clock_id_invalid_fd) } END_TEST - START_TEST(test_clock_id_events) { struct uinput_device* uidev; diff --git a/tools/libevdev-tweak-device.c b/tools/libevdev-tweak-device.c index a482d12..f2031c2 100644 --- a/tools/libevdev-tweak-device.c +++ b/tools/libevdev-tweak-device.c @@ -206,7 +206,6 @@ set_led(struct libevdev *dev) return; } - rc = libevdev_kernel_set_led_value(dev, led, state); if (rc != 0) fprintf(stderr, diff --git a/tools/touchpad-edge-detector.c b/tools/touchpad-edge-detector.c index b857934..e5420cf 100644 --- a/tools/touchpad-edge-detector.c +++ b/tools/touchpad-edge-detector.c @@ -193,4 +193,3 @@ int main (int argc, char **argv) { return rc; } - -- 2.7.4