From 68f53cd509af8812562d743a55128a1b341247f5 Mon Sep 17 00:00:00 2001 From: Ian Fan Date: Wed, 4 Mar 2020 14:34:32 +0000 Subject: tray: tidy code This includes some refactoring and fixing a small memory leak. --- swaybar/tray/host.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'swaybar/tray/host.c') diff --git a/swaybar/tray/host.c b/swaybar/tray/host.c index 451b0896..ddf2416d 100644 --- a/swaybar/tray/host.c +++ b/swaybar/tray/host.c @@ -65,9 +65,9 @@ static int handle_sni_unregistered(sd_bus_message *msg, void *data, static int get_registered_snis_callback(sd_bus_message *msg, void *data, sd_bus_error *error) { if (sd_bus_message_is_method_error(msg, NULL)) { - sd_bus_error err = *sd_bus_message_get_error(msg); - sway_log(SWAY_ERROR, "Failed to get registered SNIs: %s", err.message); - return -sd_bus_error_get_errno(&err); + const sd_bus_error *err = sd_bus_message_get_error(msg); + sway_log(SWAY_ERROR, "Failed to get registered SNIs: %s", err->message); + return -sd_bus_error_get_errno(err); } int ret = sd_bus_message_enter_container(msg, 'v', NULL); @@ -87,9 +87,11 @@ static int get_registered_snis_callback(sd_bus_message *msg, void *data, struct swaybar_tray *tray = data; for (char **id = ids; *id; ++id) { add_sni(tray, *id); + free(*id); } } + free(ids); return ret; } -- cgit v1.2.3