From 86960308e72d11be750550ce07960fbf495e824c Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Fri, 11 Sep 2015 23:45:21 +0200 Subject: [PATCH 1/3] tools: add a missing prototype --- tools/shared.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/shared.h b/tools/shared.h index 968131f4..e8075ab5 100644 --- a/tools/shared.h +++ b/tools/shared.h @@ -70,6 +70,9 @@ button_action_key_to_str(struct ratbag_button *button); char * button_action_to_str(struct ratbag_button *button); +char * +button_action_macro_to_str(struct ratbag_button *button); + enum ratbag_button_action_special str_to_special_action(const char *str); From 6a4d747132299edbc256d9617a7d5765800311f6 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Sat, 12 Sep 2015 00:02:13 +0200 Subject: [PATCH 2/3] remove a variable only used for sizeof --- src/libratbag.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/libratbag.c b/src/libratbag.c index b2b3538c..947ceffa 100644 --- a/src/libratbag.c +++ b/src/libratbag.c @@ -1294,14 +1294,12 @@ ratbag_resolution_get_user_data(const struct ratbag_resolution *ratbag_resolutio LIBRATBAG_EXPORT int ratbag_button_set_macro(struct ratbag_button *button, const char *name) { - struct ratbag_macro *macro; - if (!button->action.macro) - button->action.macro = zalloc(sizeof(*macro)); + button->action.macro = zalloc(sizeof(struct ratbag_macro)); else { if (button->action.macro->name) free(button->action.macro->name); - memset(button->action.macro, 0, sizeof(*macro)); + memset(button->action.macro, 0, sizeof(struct ratbag_macro)); } button->action.type = RATBAG_BUTTON_ACTION_TYPE_MACRO; From 7fbadce2fe3b897b15cda2d4e0e6b443137cf50d Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Sat, 12 Sep 2015 00:03:08 +0200 Subject: [PATCH 3/3] remove unused function --- src/libratbag.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/src/libratbag.c b/src/libratbag.c index 947ceffa..1776ddf2 100644 --- a/src/libratbag.c +++ b/src/libratbag.c @@ -150,35 +150,6 @@ ratbag_log_set_handler(struct ratbag *ratbag, ratbag->log_handler = log_handler; } -static inline struct udev_device * -udev_device_from_devnode(struct ratbag *ratbag, int fd) -{ - struct udev_device *dev; - struct stat st; - size_t count = 0; - struct udev *udev = ratbag->udev; - - if (fstat(fd, &st) < 0) - return NULL; - - dev = udev_device_new_from_devnum(ratbag->udev, 'c', st.st_rdev); - - while (dev && !udev_device_get_is_initialized(dev)) { - udev_device_unref(dev); - msleep(10); - dev = udev_device_new_from_devnum(udev, 'c', st.st_rdev); - - count++; - if (count > 50) { - log_bug_libratbag(ratbag, - "udev device never initialized\n"); - break; - } - } - - return dev; -} - static struct udev_device * udev_find_hidraw(struct ratbag_device *device) {