From: JengHyun Kang <jhyuni.kang@samsung.com>
Date: Wed, 25 Oct 2017 08:02:39 +0000 (+0900)
Subject: fix build warnings
X-Git-Tag: submit/tizen/20200225.010716~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5736ec366cb368534db2653046d504d44eb68a2b;p=platform%2Fupstream%2Flibinput.git

fix build warnings
---

diff --git a/src/evdev.c b/src/evdev.c
index feb9dc19..24169238 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1851,14 +1851,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;
 			}
@@ -2907,6 +2907,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);
 
@@ -2920,7 +2921,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 74b5209e..ca3e2b73 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -144,6 +144,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;
@@ -1903,6 +1905,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 df42f63e..ef224d7d 100644
--- a/src/udev-seat.c
+++ b/src/udev-seat.c
@@ -61,38 +61,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,