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

conf: rework conf_load to take a path only

Browse source 
Refacturing to make it possible to read from different paths.
This commit is contained in:
Peter Hutterer 2021-08-06 18:28:39 +10:00
parent 83f72489ad
commit 956c83f1c8
1 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/pipewire/conf.c
View file

@ -248,21 +248,12 @@ error:
return res; return res;
} }
static int conf_load(const char *prefix, const char *name, struct pw_properties *conf) static int conf_load(const char *path, struct pw_properties *conf)
{ {
char path[PATH_MAX], *data; char *data;
struct stat sbuf; struct stat sbuf;
int fd; int fd;
if (name == NULL) {
pw_log_debug(NAME" %p: config name must not be NULL", conf);
return -EINVAL;
}
if (get_read_path(path, sizeof(path), prefix, name) == 0) {
pw_log_debug(NAME" %p: can't load config '%s': %m", conf, path);
return -ENOENT;
}
if ((fd = open(path, O_CLOEXEC | O_RDONLY)) < 0) { if ((fd = open(path, O_CLOEXEC | O_RDONLY)) < 0) {
pw_log_warn(NAME" %p: error loading config '%s': %m", conf, path); pw_log_warn(NAME" %p: error loading config '%s': %m", conf, path);
return -errno; return -errno;
@ -288,13 +279,37 @@ error_close:
SPA_EXPORT SPA_EXPORT
int pw_conf_load_conf(const char *prefix, const char *name, struct pw_properties *conf) int pw_conf_load_conf(const char *prefix, const char *name, struct pw_properties *conf)
{ {
return conf_load(prefix, name, conf); char path[PATH_MAX];
if (name == NULL) {
pw_log_debug(NAME" %p: config name must not be NULL", conf);
return -EINVAL;
}
if (get_read_path(path, sizeof(path), prefix, name) == 0) {
pw_log_debug(NAME" %p: can't load config '%s': %m", conf, path);
return -ENOENT;
}
return conf_load(path, conf);
} }
SPA_EXPORT SPA_EXPORT
int pw_conf_load_state(const char *prefix, const char *name, struct pw_properties *conf) int pw_conf_load_state(const char *prefix, const char *name, struct pw_properties *conf)
{ {
return conf_load(prefix, name, conf); char path[PATH_MAX];
if (name == NULL) {
pw_log_debug(NAME" %p: config name must not be NULL", conf);
return -EINVAL;
}
if (get_read_path(path, sizeof(path), prefix, name) == 0) {
pw_log_debug(NAME" %p: can't load config '%s': %m", conf, path);
return -ENOENT;
}
return conf_load(path, conf);
} }
/* context.spa-libs = { /* context.spa-libs = {