mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2026-02-15 22:05:28 -05:00
conf: only count modules, objects and exec when added
We don't actually do anything when the name, factory or path is NULL so don't count this as an action. Commenting out these keys is a usual way for commenting out complete sections.
This commit is contained in:
parent
5cb7d4c019
commit
8d0f738882
1 changed files with 15 additions and 17 deletions
|
|
@ -730,13 +730,12 @@ static int parse_modules(void *user_data, const char *location,
|
|||
if (!have_match)
|
||||
continue;
|
||||
|
||||
if (name != NULL)
|
||||
if (name != NULL) {
|
||||
res = load_module(context, name, args, flags);
|
||||
|
||||
if (res < 0)
|
||||
break;
|
||||
|
||||
d->count++;
|
||||
if (res < 0)
|
||||
break;
|
||||
d->count++;
|
||||
}
|
||||
}
|
||||
|
||||
return res;
|
||||
|
|
@ -832,12 +831,12 @@ static int parse_objects(void *user_data, const char *location,
|
|||
if (!have_match)
|
||||
continue;
|
||||
|
||||
if (factory != NULL)
|
||||
if (factory != NULL) {
|
||||
res = create_object(context, factory, args, flags);
|
||||
|
||||
if (res < 0)
|
||||
break;
|
||||
d->count++;
|
||||
if (res < 0)
|
||||
break;
|
||||
d->count++;
|
||||
}
|
||||
}
|
||||
|
||||
return res;
|
||||
|
|
@ -942,13 +941,12 @@ static int parse_exec(void *user_data, const char *location,
|
|||
if (!have_match)
|
||||
continue;
|
||||
|
||||
if (path != NULL)
|
||||
if (path != NULL) {
|
||||
res = do_exec(context, path, args);
|
||||
|
||||
if (res < 0)
|
||||
break;
|
||||
|
||||
d->count++;
|
||||
if (res < 0)
|
||||
break;
|
||||
d->count++;
|
||||
}
|
||||
}
|
||||
|
||||
return res;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue