aboutsummaryrefslogtreecommitdiff
path: root/backend/libinput
diff options
context:
space:
mode:
authorMarkus Ongyerth <ongy@ongy.net>2018-05-15 15:41:32 +0200
committerMarkus Ongyerth <ongy@ongy.net>2018-07-14 09:43:16 +0200
commit31cec36b741d3c645c18c4e7e8dedbd6c6e3ece5 (patch)
treedcaf24b1bc55922a6e28f9de8bca2c32feeba71a /backend/libinput
parent15870ceb4b0277cc83cdd824bd521de95a77d983 (diff)
1st feedback pass
Rename make_ functions to _create Implement set_cursor and set_feedback
Diffstat (limited to 'backend/libinput')
-rw-r--r--backend/libinput/tablet_pad.c6
-rw-r--r--backend/libinput/tablet_tool.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/backend/libinput/tablet_pad.c b/backend/libinput/tablet_pad.c
index bb65adf6..f1fb6d7a 100644
--- a/backend/libinput/tablet_pad.c
+++ b/backend/libinput/tablet_pad.c
@@ -21,7 +21,11 @@ static void add_tablet_path(struct wl_list *list, const char *path) {
}
tablet_path->path = strdup(path);
- assert(tablet_path->path);
+ if (!tablet_path->path) {
+ free(tablet_path);
+ return;
+ }
+
wl_list_insert(list, &tablet_path->link);
}
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c
index a20637c1..f02e045a 100644
--- a/backend/libinput/tablet_tool.c
+++ b/backend/libinput/tablet_tool.c
@@ -79,11 +79,11 @@ struct wlr_tablet_tool *create_libinput_tablet_tool(
assert(libinput_dev);
struct wlr_libinput_tablet *libinput_tablet_tool =
calloc(1, sizeof(struct wlr_libinput_tablet));
- struct wlr_tablet_tool *wlr_tablet_tool = &libinput_tablet_tool->wlr_tool;
- if (!wlr_tablet_tool) {
+ if (!libinput_tablet_tool) {
wlr_log(WLR_ERROR, "Unable to allocate wlr_tablet_tool");
return NULL;
}
+ struct wlr_tablet_tool *wlr_tablet_tool = &libinput_tablet_tool->wlr_tool;
wl_list_init(&wlr_tablet_tool->paths);
struct udev_device *udev = libinput_device_get_udev_device(libinput_dev);