mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-02-17 22:05:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

conf: add some warnings when keys are invalid and ignored

Browse source
This commit is contained in:
Wim Taymans 2024-03-25 14:28:43 +01:00
parent cee9f740e4
commit 3bab51ca73
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/pipewire/conf.c
View file

@ -562,6 +562,8 @@ static int parse_spa_libs(void *user_data, const char *location,
if (spa_json_get_string(&it[1], value, sizeof(value)) > 0) {
pw_context_add_spa_lib(context, key, value);
d->count++;
} else {
pw_log_warn("config file error: missing spa-libs library name for '%s'", key);
}
}
return 0;
@ -716,6 +718,8 @@ static int parse_modules(void *user_data, const char *location,
break;
spa_json_enter(&it[2], &it[3]);
have_match = find_match(&it[3], &context->properties->dict);
} else {
pw_log_warn("unknown module key '%s'", key);
}
}
if (!have_match)
@ -816,6 +820,8 @@ static int parse_objects(void *user_data, const char *location,
break;
spa_json_enter(&it[2], &it[3]);
have_match = find_match(&it[3], &context->properties->dict);
} else {
pw_log_warn("unknown object key '%s'", key);
}
}
if (!have_match)
@ -924,6 +930,8 @@ static int parse_exec(void *user_data, const char *location,
break;
spa_json_enter(&it[2], &it[3]);
have_match = find_match(&it[3], &context->properties->dict);
} else {
pw_log_warn("unknown exec key '%s'", key);
}
}
if (!have_match)
@ -1134,8 +1142,11 @@ int pw_conf_match_rules(const char *str, size_t len, const char *location,
if (spa_json_enter_object(&it[2], &actions) > 0)
have_actions = true;
}
else if (spa_json_next(&it[2], &val) <= 0)
break;
else {
pw_log_warn("unknown match key '%s'", key);
if (spa_json_next(&it[2], &val) <= 0)
break;
}
}
if (!have_match || !have_actions)
continue;