opensourcemirror
/
pipewire
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Wim Taymans 2024-03-28 17:00:56 +01:00
parent 8351a17197
commit d0c9d2f99d
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/pipewire/conf.c
View File

@ -804,13 +804,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++;
}
}
if (r < 0)
pw_log_warn("malformed object array in '%.*s'", (int)len, str);
@ -915,12 +914,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++;
}
}
if (r < 0)
pw_log_warn("malformed object array in '%.*s'", (int)len, str);
@ -1035,13 +1034,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++;
}
}
if (r < 0)
pw_log_warn("malformed object array in '%.*s'", (int)len, str);