filter: constify the interfaces and make them static

No functional change

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/src/filter-flat.c b/src/filter-flat.c
index b07542ef752b997a164493612c4a1c5c79977991..0ee6c9223ee6d42a1cb70f80f174762bae4af8ea 100644 (file)
--- a/src/filter-flat.c
+++ b/src/filter-flat.c
@@ -100,7 +100,7 @@ accelerator_destroy_flat(struct motion_filter *filter)
        free(accel);
 }
 
-struct motion_filter_interface accelerator_interface_flat = {
+static const struct motion_filter_interface accelerator_interface_flat = {
        .type = LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT,
        .filter = accelerator_filter_flat,
        .filter_constant = accelerator_filter_noop_flat,

diff --git a/src/filter-low-dpi.c b/src/filter-low-dpi.c
index ea35656ce8a974c3a5c49fb15b6d4c8358b687b8..ffcf9114a3e7bbce7985f5cb2aad0dcaf89ad49d 100644 (file)
--- a/src/filter-low-dpi.c
+++ b/src/filter-low-dpi.c
@@ -205,7 +205,7 @@ accelerator_set_speed(struct motion_filter *filter,
        return true;
 }
 
-struct motion_filter_interface accelerator_interface_low_dpi = {
+static const struct motion_filter_interface accelerator_interface_low_dpi = {
        .type = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE,
        .filter = accelerator_filter_low_dpi,
        .filter_constant = accelerator_filter_noop,

diff --git a/src/filter-mouse.c b/src/filter-mouse.c
index aa56a050448125abacf8d1bf370eaee707b88950..8f5727529fd714a1c95b7be53777df549ccc71a6 100644 (file)
--- a/src/filter-mouse.c
+++ b/src/filter-mouse.c
@@ -269,7 +269,7 @@ pointer_accel_profile_linear(struct motion_filter *filter,
        return factor;
 }
 
-struct motion_filter_interface accelerator_interface = {
+static const struct motion_filter_interface accelerator_interface = {
        .type = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE,
        .filter = accelerator_filter_linear,
        .filter_constant = accelerator_filter_noop,

diff --git a/src/filter-private.h b/src/filter-private.h
index b24a5c9af739f1a3a9f0b87a87c559642dc7e6a1..470d103786dcb0bb060ee18894e886d799b62941 100644 (file)
--- a/src/filter-private.h
+++ b/src/filter-private.h
@@ -48,7 +48,7 @@ struct motion_filter_interface {
 
 struct motion_filter {
        double speed_adjustment; /* normalized [-1, 1] */
-       struct motion_filter_interface *interface;
+       const struct motion_filter_interface *interface;
 };
 
 struct pointer_tracker {

diff --git a/src/filter-tablet.c b/src/filter-tablet.c
index 24afb56cb733c1f9ac87eab98485284c09436a25..4415b9ea51eca1ca572944894ca308de6b0eb6ef 100644 (file)
--- a/src/filter-tablet.c
+++ b/src/filter-tablet.c
@@ -143,7 +143,7 @@ tablet_accelerator_destroy(struct motion_filter *filter)
        free(accel_filter);
 }
 
-struct motion_filter_interface accelerator_interface_tablet = {
+static const struct motion_filter_interface accelerator_interface_tablet = {
        .type = LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT,
        .filter = tablet_accelerator_filter_flat,
        .filter_constant = NULL,

diff --git a/src/filter-touchpad-flat.c b/src/filter-touchpad-flat.c
index bb6c31adb7283b84440371d4b56115329650aa1d..34867af366cfbfa1058b6e4c20b54957931f9f2a 100644 (file)
--- a/src/filter-touchpad-flat.c
+++ b/src/filter-touchpad-flat.c
@@ -104,7 +104,7 @@ accelerator_destroy_touchpad_flat(struct motion_filter *filter)
        free(accel);
 }
 
-struct motion_filter_interface accelerator_interface_touchpad_flat = {
+static const struct motion_filter_interface accelerator_interface_touchpad_flat = {
        .type = LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT,
        .filter = accelerator_filter_touchpad_flat,
        .filter_constant = accelerator_filter_noop_touchpad_flat,

diff --git a/src/filter-touchpad-x230.c b/src/filter-touchpad-x230.c
index fa70a57ded7509c95246b11e7c17a08ac90242bd..90c42140aa08289556f9ff3a8b1f5ad4c5f34c48 100644 (file)
--- a/src/filter-touchpad-x230.c
+++ b/src/filter-touchpad-x230.c
@@ -283,7 +283,7 @@ touchpad_lenovo_x230_accel_profile(struct motion_filter *filter,
        return factor * X230_MAGIC_SLOWDOWN / X230_TP_MAGIC_LOW_RES_FACTOR;
 }
 
-struct motion_filter_interface accelerator_interface_x230 = {
+static const struct motion_filter_interface accelerator_interface_x230 = {
        .type = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE,
        .filter = accelerator_filter_x230,
        .filter_constant = accelerator_filter_constant_x230,

diff --git a/src/filter-touchpad.c b/src/filter-touchpad.c
index e8bc8c587714818fd5875d53a240188c70ea9858..cd51a7ea63217b3dd2466e1c557c014f71b0294b 100644 (file)
--- a/src/filter-touchpad.c
+++ b/src/filter-touchpad.c
@@ -284,7 +284,7 @@ touchpad_accel_profile_linear(struct motion_filter *filter,
        return factor * TP_MAGIC_SLOWDOWN;
 }
 
-struct motion_filter_interface accelerator_interface_touchpad = {
+static const struct motion_filter_interface accelerator_interface_touchpad = {
        .type = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE,
        .filter = accelerator_filter_touchpad,
        .filter_constant = touchpad_constant_filter,

diff --git a/src/filter-trackpoint.c b/src/filter-trackpoint.c
index c068661660fc7c93b42d08a0471b2dd4bcb8965d..d1731e28980c9f34921bcdec07cca0a8b4dd47b0 100644 (file)
--- a/src/filter-trackpoint.c
+++ b/src/filter-trackpoint.c
@@ -171,7 +171,7 @@ trackpoint_accelerator_destroy(struct motion_filter *filter)
        free(accel_filter);
 }
 
-struct motion_filter_interface accelerator_interface_trackpoint = {
+static const struct motion_filter_interface accelerator_interface_trackpoint = {
        .type = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE,
        .filter = trackpoint_accelerator_filter,
        .filter_constant = trackpoint_accelerator_filter_noop,