diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2022-11-23 08:41:07 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2022-11-25 10:08:20 +1000 |
commit | a5dd45e8cee88f10bb78fecfd49e85df840ae38f (patch) | |
tree | 26e15ea6a6017b5b7101fb130d3f1dd1c915817b | |
parent | d2f677383144ccb1fd92c475550c9f6b480ee0b6 (diff) | |
download | libinput-a5dd45e8cee88f10bb78fecfd49e85df840ae38f.tar.gz |
Remove duplicate empty lines in our source
We only touch src and tools, imported headers from include are not ours
to change.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r-- | src/evdev-mt-touchpad.c | 4 | ||||
-rw-r--r-- | src/evdev.c | 2 | ||||
-rw-r--r-- | src/evdev.h | 1 | ||||
-rw-r--r-- | src/filter-touchpad-flat.c | 1 | ||||
-rw-r--r-- | src/filter-trackpoint-flat.c | 1 | ||||
-rw-r--r-- | src/filter-trackpoint.c | 1 | ||||
-rw-r--r-- | src/libinput-private.h | 2 | ||||
-rw-r--r-- | src/libinput-util.h | 1 | ||||
-rw-r--r-- | src/path-seat.c | 1 | ||||
-rw-r--r-- | src/quirks.c | 1 | ||||
-rw-r--r-- | src/quirks.h | 1 | ||||
-rw-r--r-- | src/udev-seat.c | 1 | ||||
-rw-r--r-- | src/util-bits.h | 1 | ||||
-rw-r--r-- | src/util-input-event.h | 1 | ||||
-rw-r--r-- | src/util-list.h | 1 | ||||
-rw-r--r-- | src/util-macros.h | 2 | ||||
-rw-r--r-- | src/util-matrix.h | 1 | ||||
-rw-r--r-- | src/util-strings.c | 2 | ||||
-rw-r--r-- | tools/libinput-debug-events.c | 1 | ||||
-rw-r--r-- | tools/libinput-debug-gui.c | 1 | ||||
-rw-r--r-- | tools/libinput-record.c | 2 | ||||
-rw-r--r-- | tools/shared.c | 1 |
22 files changed, 0 insertions, 30 deletions
diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c index a6afbdac..c79133b5 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c @@ -679,7 +679,6 @@ tp_process_fake_touches(struct tp_dispatch *tp, tp->num_slots = tp->nactive_slots; } - start = tp->has_mt ? tp->num_slots : 0; for (i = start; i < tp->ntouches; i++) { t = tp_get_touch(tp, i); @@ -2213,7 +2212,6 @@ tp_trackpoint_event(uint64_t time, struct libinput_event *event, void *data) tp->palm.trackpoint_last_event_time = time; tp->palm.trackpoint_event_count++; - /* Require at least three events before enabling palm detection */ if (tp->palm.trackpoint_event_count < 3) { libinput_timer_set(&tp->palm.trackpoint_timer, @@ -3618,7 +3616,6 @@ tp_init_pressure(struct tp_dispatch *tp, lo = abs->minimum + 0.10 * range; } - if (hi > abs->maximum || hi < abs->minimum || lo > abs->maximum || lo < abs->minimum) { evdev_log_bug_libinput(device, @@ -3731,7 +3728,6 @@ tp_init(struct tp_dispatch *tp, if (!tp_init_slots(tp, device)) return false; - evdev_device_init_abs_range_warnings(device); use_touch_size = tp_init_touch_size(tp, device); diff --git a/src/evdev.c b/src/evdev.c index 426933d1..2c4d4726 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -862,7 +862,6 @@ evdev_scroll_get_default_button_lock(struct libinput_device *device) return LIBINPUT_CONFIG_SCROLL_BUTTON_LOCK_DISABLED; } - void evdev_set_button_scroll_lock_enabled(struct evdev_device *device, bool enabled) @@ -1899,7 +1898,6 @@ evdev_device_is_joystick_or_gamepad(struct evdev_device *device) if (!has_joystick_tags) return false; - unsigned int num_well_known_keys = 0; for (size_t i = 0; i < ARRAY_LENGTH(well_known_keyboard_keys); i++) { diff --git a/src/evdev.h b/src/evdev.h index 980c5943..0f0087a3 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -338,7 +338,6 @@ struct evdev_dispatch_interface { const struct phys_rect *rect, uint64_t now); - /* Return the state of the given switch */ enum libinput_switch_state (*get_switch_state)(struct evdev_dispatch *dispatch, diff --git a/src/filter-touchpad-flat.c b/src/filter-touchpad-flat.c index 9c0075bd..ac1a15c1 100644 --- a/src/filter-touchpad-flat.c +++ b/src/filter-touchpad-flat.c @@ -34,7 +34,6 @@ #include "libinput-util.h" #include "filter-private.h" - #define TP_MAGIC_SLOWDOWN_FLAT 0.2968 struct touchpad_accelerator_flat { diff --git a/src/filter-trackpoint-flat.c b/src/filter-trackpoint-flat.c index d650a667..7f63a0e3 100644 --- a/src/filter-trackpoint-flat.c +++ b/src/filter-trackpoint-flat.c @@ -113,7 +113,6 @@ trackpoint_flat_set_speed(struct motion_filter *filter, filter->speed_adjustment = speed_adjustment; accel_filter->speed_factor = speed_factor(speed_adjustment); - return true; } diff --git a/src/filter-trackpoint.c b/src/filter-trackpoint.c index d1731e28..a46729b7 100644 --- a/src/filter-trackpoint.c +++ b/src/filter-trackpoint.c @@ -146,7 +146,6 @@ trackpoint_accelerator_set_speed(struct motion_filter *filter, filter->speed_adjustment = speed_adjustment; accel_filter->speed_factor = speed_factor(speed_adjustment); - return true; } diff --git a/src/libinput-private.h b/src/libinput-private.h index aca4d965..f20944bb 100644 --- a/src/libinput-private.h +++ b/src/libinput-private.h @@ -467,7 +467,6 @@ is_logged(const struct libinput *libinput, libinput->log_priority <= priority; } - void log_msg_ratelimit(struct libinput *libinput, struct ratelimit *ratelimit, @@ -923,5 +922,4 @@ static inline void *libinput_libwacom_ref(struct libinput *li) { return NULL; } static inline void libinput_libwacom_unref(struct libinput *li) {} #endif - #endif /* LIBINPUT_PRIVATE_H */ diff --git a/src/libinput-util.h b/src/libinput-util.h index 275d8c0b..8b14f76d 100644 --- a/src/libinput-util.h +++ b/src/libinput-util.h @@ -31,7 +31,6 @@ #warning "libinput relies on assert(). #defining NDEBUG is not recommended" #endif - #include "libinput.h" #include "util-bits.h" diff --git a/src/path-seat.c b/src/path-seat.c index 1d9282fe..560c0b45 100644 --- a/src/path-seat.c +++ b/src/path-seat.c @@ -44,7 +44,6 @@ struct path_seat { struct libinput_seat base; }; - static const char default_seat[] = "seat0"; static const char default_seat_name[] = "default"; diff --git a/src/quirks.c b/src/quirks.c index c264dd38..932706f3 100644 --- a/src/quirks.c +++ b/src/quirks.c @@ -1517,7 +1517,6 @@ quirks_fetch_for_device(struct quirks_context *ctx, return q; } - static inline struct property * quirk_find_prop(struct quirks *q, enum quirk which) { diff --git a/src/quirks.h b/src/quirks.h index bb01f8b5..8f1aae91 100644 --- a/src/quirks.h +++ b/src/quirks.h @@ -88,7 +88,6 @@ enum quirk { _QUIRK_LAST_MODEL_QUIRK_, /* Guard: do not modify */ - QUIRK_ATTR_SIZE_HINT = 300, QUIRK_ATTR_TOUCH_SIZE_RANGE, QUIRK_ATTR_PALM_SIZE_THRESHOLD, diff --git a/src/udev-seat.c b/src/udev-seat.c index 7fc1dcef..fb1a4a3d 100644 --- a/src/udev-seat.c +++ b/src/udev-seat.c @@ -41,7 +41,6 @@ udev_seat_create(struct udev_input *input, static struct udev_seat * udev_seat_get_named(struct udev_input *input, const char *seat_name); - static inline bool filter_duplicates(struct udev_seat *udev_seat, struct udev_device *udev_device) diff --git a/src/util-bits.h b/src/util-bits.h index 47c40f38..b4e58d38 100644 --- a/src/util-bits.h +++ b/src/util-bits.h @@ -37,7 +37,6 @@ #define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS) #define NCHARS(x) ((size_t)(((x) + 7) / 8)) - /* This bitfield helper implementation is taken from from libevdev-util.h, * except that it has been modified to work with arrays of unsigned chars */ diff --git a/src/util-input-event.h b/src/util-input-event.h index 0c49bf73..8a81aec5 100644 --- a/src/util-input-event.h +++ b/src/util-input-event.h @@ -57,7 +57,6 @@ input_event_time(const struct input_event *e) return tv2us(&tval); } - static inline void input_event_set_time(struct input_event *e, uint64_t time) diff --git a/src/util-list.h b/src/util-list.h index 6c7f3bdf..a9f0c87b 100644 --- a/src/util-list.h +++ b/src/util-list.h @@ -35,7 +35,6 @@ * Wayland project; except that wl_ prefix has been removed. */ - /** * Doubly linked list implementation. This struct is used for both the list * nodes and the list head. Use like this: diff --git a/src/util-macros.h b/src/util-macros.h index 004b0ccf..d56a8a3f 100644 --- a/src/util-macros.h +++ b/src/util-macros.h @@ -55,13 +55,11 @@ #define ANSI_BRIGHT_CYAN "\x1B[0;36;1m" #define ANSI_NORMAL "\x1B[0m" - #define ANSI_UP "\x1B[%dA" #define ANSI_DOWN "\x1B[%dB" #define ANSI_RIGHT "\x1B[%dC" #define ANSI_LEFT "\x1B[%dD" - #define CASE_RETURN_STRING(a) case a: return #a #define _fallthrough_ __attribute__((fallthrough)) diff --git a/src/util-matrix.h b/src/util-matrix.h index e5a60cb0..e9d680ed 100644 --- a/src/util-matrix.h +++ b/src/util-matrix.h @@ -22,7 +22,6 @@ * DEALINGS IN THE SOFTWARE. */ - #pragma once #include "config.h" diff --git a/src/util-strings.c b/src/util-strings.c index 4cd26743..d0a3fa01 100644 --- a/src/util-strings.c +++ b/src/util-strings.c @@ -110,7 +110,6 @@ strv_from_string(const char *in, const char *separators, size_t *num_elements) { assert(in != NULL); - const char *s = in; size_t l, nelems = 0; while (next_word(&s, &l, separators) != NULL) @@ -216,7 +215,6 @@ safe_basename(const char *filename) return basename + 1; } - /** * Similar to basename() but returns the trunk only without the (last) * trailing suffix, so that: diff --git a/tools/libinput-debug-events.c b/tools/libinput-debug-events.c index 8b8da6f1..9ad71b6a 100644 --- a/tools/libinput-debug-events.c +++ b/tools/libinput-debug-events.c @@ -819,7 +819,6 @@ print_tablet_pad_key_event(struct libinput_event *ev) state == LIBINPUT_KEY_STATE_PRESSED ? "pressed" : "released"); } - static void print_switch_event(struct libinput_event *ev) { diff --git a/tools/libinput-debug-gui.c b/tools/libinput-debug-gui.c index 60df2ae5..1380862d 100644 --- a/tools/libinput-debug-gui.c +++ b/tools/libinput-debug-gui.c @@ -789,7 +789,6 @@ draw_tablet(struct window *w, cairo_t *cr) } cairo_restore(cr); - /* tablet tool, square for prox-in location */ cairo_save(cr); cairo_set_source_rgb(cr, .2, .6, .6); diff --git a/tools/libinput-record.c b/tools/libinput-record.c index 98b48811..0b03ad06 100644 --- a/tools/libinput-record.c +++ b/tools/libinput-record.c @@ -965,7 +965,6 @@ print_tablet_tool_button_event(struct record_device *dev, abort(); } - button = libinput_event_tablet_tool_get_button(t); state = libinput_event_tablet_tool_get_button_state(t); time = time_offset(dev->ctx, libinput_event_tablet_tool_get_time_usec(t)); @@ -1071,7 +1070,6 @@ print_tablet_pad_button_event(struct record_device *dev, libinput_tablet_pad_mode_group_button_is_toggle(group, button) ? "true" : "false" ); - } static void diff --git a/tools/shared.c b/tools/shared.c index 760327a4..8dc3b607 100644 --- a/tools/shared.c +++ b/tools/shared.c @@ -460,7 +460,6 @@ tools_device_apply_config(struct libinput_device *device, libinput_device_config_scroll_set_button_lock(device, options->scroll_button_lock); - if (libinput_device_config_accel_is_available(device)) { libinput_device_config_accel_set_speed(device, options->speed); |