DrathOrg/libratbag-plus
1
0
Fork 0
forked from drath/libratbag
Code Pull Requests Activity

ratbagctl: split get_profile_path()

Browse Source 
Split get_profile_path() and provide an helper for get_device_path() on
its own.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
This commit is contained in:
David Herrmann
2015-09-29 19:00:27 +02:00
parent 85a045c538
commit acb0118897
1 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/ratbagctl.c
View File

@@ -69,16 +69,13 @@ static int ratbagctl_new(struct ratbagctl **out)
return 0;
}
static int get_profile_path(struct ratbagctl *ctl,
const char *device_name,
const char *profile_name,
char **out_path,
sd_bus_error *error)
static int get_device_path(struct ratbagctl *ctl,
const char *device_name,
char **out_path,
sd_bus_error *error)
{
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply2 = NULL;
const char *device_path = NULL, *profile_path = NULL;
unsigned int profile_index;
const char *device_path = NULL;
char *path;
int r;
@@ -141,6 +138,32 @@ static int get_profile_path(struct ratbagctl *ctl,
assert(device_path);
path = strdup(device_path);
if (!path)
return -ENOMEM;
*out_path = path;
return 0;
}
static int get_profile_path(struct ratbagctl *ctl,
const char *device_name,
const char *profile_name,
char **out_path,
sd_bus_error *error)
{
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply2 = NULL;
_cleanup_(freep) char *device_path = NULL;
const char *profile_path = NULL;
unsigned int profile_index;
char *path;
int r;
r = get_device_path(ctl, device_name, &device_path, error);
if (r < 0)
return r;
if (profile_name) {
r = safe_atou(profile_name, &profile_index);
if (r < 0)