mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-09 13:30:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

conf: return the error

Browse source 
Only return the loaded items when there is no error.
This commit is contained in:
Wim Taymans 2022-02-22 12:41:58 +01:00
parent 542b0acd73
commit bc8df52317
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/pipewire/conf.c
View file

@ -863,23 +863,24 @@ int pw_context_parse_conf_section(struct pw_context *context,
struct pw_properties *conf, const char *section) struct pw_properties *conf, const char *section)
{ {
struct data data = { .context = context }; struct data data = { .context = context };
int res;
if (spa_streq(section, "context.spa-libs")) if (spa_streq(section, "context.spa-libs"))
pw_context_conf_section_for_each(context, section, res = pw_context_conf_section_for_each(context, section,
parse_spa_libs, &data); parse_spa_libs, &data);
else if (spa_streq(section, "context.modules")) else if (spa_streq(section, "context.modules"))
pw_context_conf_section_for_each(context, section, res = pw_context_conf_section_for_each(context, section,
parse_modules, &data); parse_modules, &data);
else if (spa_streq(section, "context.objects")) else if (spa_streq(section, "context.objects"))
pw_context_conf_section_for_each(context, section, res = pw_context_conf_section_for_each(context, section,
parse_objects, &data); parse_objects, &data);
else if (spa_streq(section, "context.exec")) else if (spa_streq(section, "context.exec"))
pw_context_conf_section_for_each(context, section, res = pw_context_conf_section_for_each(context, section,
parse_exec, &data); parse_exec, &data);
else else
data.count = -EINVAL; res = -EINVAL;
return data.count; return res == 0 ? data.count : res;
} }
static int update_props(void *user_data, const char *location, const char *key, static int update_props(void *user_data, const char *location, const char *key,
@ -895,9 +896,10 @@ int pw_context_conf_update_props(struct pw_context *context,
const char *section, struct pw_properties *props) const char *section, struct pw_properties *props)
{ {
struct data data = { .context = context, .props = props }; struct data data = { .context = context, .props = props };
pw_context_conf_section_for_each(context, section, int res;
res = pw_context_conf_section_for_each(context, section,
update_props, &data); update_props, &data);
return data.count; return res == 0 ? data.count : res;
} }
struct match { struct match {