drath/libratbag
1
0
Fork 1
mirror of https://github.com/libratbag/libratbag.git synced 2026-11-07 23:23:52 +01:00
Code Issues Projects Releases Wiki Activity

ratbagd: never return ENODATA for Get()

Browse Source 
We should always provide valid data if requested via Get().
Unfortunately, DBus still does not include 'maybe' types, so we just
return something that is clearly invalid data.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
This commit is contained in:
David Herrmann
2015-09-29 16:33:30 +02:00
parent ff8f391e91
commit e189dc3b1f
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ratbagctl.c
View File

@@ -211,6 +211,11 @@ static int show_device_get_profile_index(struct ratbagctl *ctl,
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
int r;
if (streq(path, "/")) {
*out_index = -1;
return 0;
}
r = sd_bus_call_method(ctl->bus,
"org.freedesktop.ratbag1",
path,
@@ -244,7 +249,7 @@ static int show_device_print(struct ratbagctl *ctl, const char *device)
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
unsigned int prop_min_index = 0, prop_max_index = 0;
unsigned int prop_active_profile = 0;
unsigned int prop_active_profile = -1;
const char *prop_id = NULL, *prop_description = NULL;
_cleanup_(freep) char *path = NULL;
int r;
@@ -343,6 +348,7 @@ static int show_device_print(struct ratbagctl *ctl, const char *device)
goto exit;
printf("%s - %s\n", prop_id, prop_description);
if (prop_min_index == prop_max_index)
printf("\t Profiles:\n");
else if (prop_min_index + 1 == prop_max_index)
@@ -350,7 +356,11 @@ static int show_device_print(struct ratbagctl *ctl, const char *device)
else
printf("\t Profiles: %u - %u\n",
prop_min_index, prop_max_index - 1);
printf("\t Active Profile: %u\n", prop_active_profile);
if (prop_active_profile == (unsigned int)-1)
printf("\t Active Profile: (unknown)\n");
else
printf("\t Active Profile: %u\n", prop_active_profile);
exit:
if (r < 0)

3
src/ratbagd-device.c
View File

@@ -190,7 +190,8 @@ static int ratbagd_device_get_active_profile(sd_bus *bus,
ratbagd_profile_get_path(profile));
}
return -ENODATA;
/* Eww, we want 'maybe' types here! */
return sd_bus_message_append(reply, "o", "/");
}
const sd_bus_vtable ratbagd_device_vtable[] = {