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

pipewire: remove redundant code

Browse source 
The generic code can now also handle the single character debug
specification.
This commit is contained in:
Wim Taymans 2022-12-14 18:54:50 +01:00
parent 9b3b6e2401
commit 5f30ccae50
1 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/pipewire/pipewire.c
View file

@ -536,14 +536,6 @@ parse_pw_debug_env(void)
*/ */
pos += spa_scnprintf(pos, end - pos, "[ { conn.* = %d },", SPA_LOG_LEVEL_NONE); pos += spa_scnprintf(pos, end - pos, "[ { conn.* = %d },", SPA_LOG_LEVEL_NONE);
/* We only have single-digit log levels, so any single-character
* string is of the form PIPEWIRE_DEBUG=<N> */
if (slen == 1) {
if (parse_log_level(str, &lvl))
pw_log_set_level(lvl);
goto out;
}
tokens = pw_split_strv(str, ",", INT_MAX, &n_tokens); tokens = pw_split_strv(str, ",", INT_MAX, &n_tokens);
if (n_tokens > 0) { if (n_tokens > 0) {
int i; int i;
@ -560,14 +552,14 @@ parse_pw_debug_env(void)
} else if (n_tok == 1 && parse_log_level(tok[0], &lvl)) { } else if (n_tok == 1 && parse_log_level(tok[0], &lvl)) {
pw_log_set_level(lvl); pw_log_set_level(lvl);
} else { } else {
pw_log_warn("Ignoring invalid format in PIPEWIRE_DEBUG: '%s'\n", tokens[i]); pw_log_warn("Ignoring invalid format in PIPEWIRE_DEBUG: '%s'",
tokens[i]);
} }
pw_free_strv(tok); pw_free_strv(tok);
} }
} }
pw_free_strv(tokens); pw_free_strv(tokens);
out:
pos += spa_scnprintf(pos, end - pos, "]"); pos += spa_scnprintf(pos, end - pos, "]");
return strdup(json); return strdup(json);
} }