From c6627d62668f4dee7d1a95d23d71a4eefb9bb45e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 19 Feb 2016 14:16:08 +1000 Subject: [PATCH] device: if we can't fetch the description or svg, return an empty string Less exception handling needed on the client side. Signed-off-by: Peter Hutterer --- src/ratbagd-device.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ratbagd-device.c b/src/ratbagd-device.c index 8fb36684..2f4dc3af 100644 --- a/src/ratbagd-device.c +++ b/src/ratbagd-device.c @@ -137,8 +137,11 @@ static int ratbagd_device_get_description(sd_bus *bus, const char *description; description = ratbag_device_get_name(device->lib_device); - if (!description) - return -ENODATA; + if (!description) { + log_error("Unable to fetch description for %s\n", + ratbagd_device_get_name(device)); + description = ""; + } return sd_bus_message_append(reply, "s", description); } @@ -155,8 +158,11 @@ static int ratbagd_device_get_svg(sd_bus *bus, const char *svg; svg = ratbag_device_get_svg_name(device->lib_device); - if (!svg) - return -ENODATA; + if (!svg) { + log_error("Unable to fetch SVG for %s\n", + ratbagd_device_get_name(device)); + svg = ""; + } return sd_bus_message_append(reply, "s", svg); }