fix build warnings

diff --git a/src/evdev.c b/src/evdev.c
index 9d666cf16d16a0c2eae805ad4aa2c17191dc9429..252ff3658a982dca256d29531fb569c057bd16db 100644 (file)
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1869,14 +1869,14 @@ evdev_configure_device(struct evdev_device *device)
                env = getenv("LIBINPUT_IGNORE_JOYSTICK");
                if (env && atoi(env) == 1) {
                        evdev_log_info(device,
-                                "input device '%s', have joystick, ignoring\n",
+                                "input device '%s' have joystick, ignoring\n",
                                 device->devname);
                                return NULL;
                }
                else {
                        if ((udev_tags & EVDEV_UDEV_TAG_JOYSTICK) == udev_tags) {
                                evdev_log_info(device,
-                                        "input device '%s', %s is a joystick, ignoring\n",
+                                        "input device '%s' is a joystick, ignoring\n",
                                         device->devname);
                                return NULL;
                        }
@@ -2975,6 +2975,7 @@ evdev_device_destroy(struct evdev_device *device)
        struct evdev_dispatch *dispatch;
 
        dispatch = device->dispatch;
+       evdev_device_free_aux_data(device);
        if (dispatch)
                dispatch->interface->destroy(dispatch);
 
@@ -2988,7 +2989,6 @@ evdev_device_destroy(struct evdev_device *device)
        libinput_seat_unref(device->base.seat);
        libevdev_free(device->evdev);
        udev_device_unref(device->udev_device);
-       evdev_device_free_aux_data(device);
        free(device);
 }
 

diff --git a/src/libinput.c b/src/libinput.c
index 9092969ab57f6550f100f18ffae255a8d78b769a..c2eebb3eee75459d33df8ec7dca216254aa506f0 100644 (file)
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -113,6 +113,8 @@ event_type_to_str(enum libinput_event_type type)
        CASE_RETURN_STRING(LIBINPUT_EVENT_SWITCH_TOGGLE);
        case LIBINPUT_EVENT_NONE:
                abort();
+       default:
+               break;
        }
 
        return NULL;
@@ -1905,6 +1907,8 @@ libinput_event_get_touch_aux_data(struct libinput_event *event)
                break;
        case LIBINPUT_EVENT_TOUCH_AUX_DATA:
                return (struct libinput_event_touch_aux_data *) event;
+       default:
+               break;
        }
 
        return NULL;

diff --git a/src/udev-seat.c b/src/udev-seat.c
index e0d8fd72f0eb2c1a854a3239470a9fd31de0e35c..d0288ae89358bb08c911c69678310e515b4f7e3d 100644 (file)
--- a/src/udev-seat.c
+++ b/src/udev-seat.c
@@ -92,38 +92,6 @@ libinput_path_has_device(struct libinput *libinput, const char *devnode)
        return false;
 }
 
-/**
- * Return the next word in a string pointed to by state before the first
- * separator character. Call repeatedly to tokenize a whole string.
- *
- * @param state Current state
- * @param len String length of the word returned
- * @param separators List of separator characters
- *
- * @return The first word in *state, NOT null-terminated
- */
-static const char *
-next_word(const char **state, size_t *len, const char *separators)
-{
-       const char *next = *state;
-       size_t l;
-
-       if (!*next)
-               return NULL;
-
-       next += strspn(next, separators);
-       if (!*next) {
-               *state = next;
-               return NULL;
-       }
-
-       l = strcspn(next, separators);
-       *state = next + l;
-       *len = l;
-
-       return next;
-}
-
 static int
 device_added(struct udev_device *udev_device,
             struct udev_input *input,