From a62e2b14a2bc1cbfce91772d61b9359c191e0d05 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 9 Sep 2020 11:17:12 +1000 Subject: [PATCH] Drop the trailing slash from the HTTP_DOC_LINK It makes the printf statements nicer and we ne don't use it on its own anywhere anyway. Signed-off-by: Peter Hutterer --- meson.build | 4 ++-- src/evdev-debounce.c | 2 +- src/evdev-mt-touchpad.c | 6 +++--- src/evdev-tablet.c | 4 ++-- src/evdev.h | 2 +- src/libinput.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index b037d9ed..492aba58 100644 --- a/meson.build +++ b/meson.build @@ -52,9 +52,9 @@ config_h = configuration_data() doc_url_base = 'https://wayland.freedesktop.org/libinput/doc' if libinput_version[2].to_int() >= 90 - doc_url = '@0@/latest/'.format(doc_url_base) + doc_url = '@0@/latest'.format(doc_url_base) else - doc_url = '@0@/@1@/'.format(doc_url_base, meson.project_version()) + doc_url = '@0@/@1@'.format(doc_url_base, meson.project_version()) endif config_h.set_quoted('HTTP_DOC_LINK', doc_url) diff --git a/src/evdev-debounce.c b/src/evdev-debounce.c index 33ff05db..9864cac2 100644 --- a/src/evdev-debounce.c +++ b/src/evdev-debounce.c @@ -162,7 +162,7 @@ debounce_enable_spurious(struct fallback_dispatch *fallback) fallback->debounce.spurious_enabled = true; evdev_log_info(fallback->device, "Enabling spurious button debouncing, " - "see %sbutton-debouncing.html for details\n", + "see %s/button-debouncing.html for details\n", HTTP_DOC_LINK); } diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c index 4c017c35..1608e793 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c @@ -201,7 +201,7 @@ tp_detect_wobbling(struct tp_dispatch *tp, tp->hysteresis.enabled = true; evdev_log_debug(tp->device, "hysteresis enabled. " - "See %stouchpad-jitter.html for details\n", + "See %s/touchpad-jitter.html for details\n", HTTP_DOC_LINK); } } @@ -1754,7 +1754,7 @@ tp_process_state(struct tp_dispatch *tp, uint64_t time) evdev_log_bug_kernel_ratelimit(tp->device, &tp->jump.warning, "Touch jump detected and discarded.\n" - "See %stouchpad-jumping-cursors.html for details\n", + "See %s/touchpad-jumping-cursors.html for details\n", HTTP_DOC_LINK); tp_motion_history_reset(t); } @@ -3494,7 +3494,7 @@ tp_init_hysteresis(struct tp_dispatch *tp) if (tp->hysteresis.enabled) evdev_log_debug(tp->device, "hysteresis enabled. " - "See %stouchpad-jitter.html for details\n", + "See %s/touchpad-jitter.html for details\n", HTTP_DOC_LINK); } diff --git a/src/evdev-tablet.c b/src/evdev-tablet.c index 9c66782e..9890aab4 100644 --- a/src/evdev-tablet.c +++ b/src/evdev-tablet.c @@ -1345,7 +1345,7 @@ detect_pressure_offset(struct tablet_dispatch *tablet, if (offset > axis_range_percentage(pressure, 20)) { evdev_log_error(device, "Ignoring pressure offset greater than 20%% detected on tool %s (serial %#x). " - "See %stablet-support.html\n", + "See %s/tablet-support.html\n", tablet_tool_type_to_string(tool->type), tool->serial, HTTP_DOC_LINK); @@ -1354,7 +1354,7 @@ detect_pressure_offset(struct tablet_dispatch *tablet, evdev_log_info(device, "Pressure offset detected on tool %s (serial %#x). " - "See %stablet-support.html\n", + "See %s/tablet-support.html\n", tablet_tool_type_to_string(tool->type), tool->serial, HTTP_DOC_LINK); diff --git a/src/evdev.h b/src/evdev.h index b0b1b8c6..0a4798f2 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -1003,7 +1003,7 @@ evdev_device_check_abs_axis_range(struct evdev_device *device, log_info_ratelimit(evdev_libinput_context(device), &device->abs.warning_range.range_warn_limit, "Axis %#x value %d is outside expected range [%d, %d]\n" - "See %sabsolute_coordinate_ranges.html for details\n", + "See %s/absolute_coordinate_ranges.html for details\n", code, value, min, max, HTTP_DOC_LINK); } diff --git a/src/libinput.c b/src/libinput.c index 423f81c7..f544ef94 100644 --- a/src/libinput.c +++ b/src/libinput.c @@ -1821,7 +1821,7 @@ libinput_init_quirks(struct libinput *libinput) log_error(libinput, "Failed to load the device quirks from %s%s%s. " "This will negatively affect device behavior. " - "See %sdevice-quirks.html for details.\n", + "See %s/device-quirks.html for details.\n", data_path, override_file ? " and " : "", override_file ? override_file : "", -- 2.34.1