From 5f30ccae50445f6b705ec0c56619ecb2a7f971c0 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 14 Dec 2022 18:54:50 +0100 Subject: [PATCH] pipewire: remove redundant code The generic code can now also handle the single character debug specification. --- src/pipewire/pipewire.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/pipewire/pipewire.c b/src/pipewire/pipewire.c index eb8600636..cc5610ed8 100644 --- a/src/pipewire/pipewire.c +++ b/src/pipewire/pipewire.c @@ -536,14 +536,6 @@ parse_pw_debug_env(void) */ 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= */ - 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); if (n_tokens > 0) { int i; @@ -560,14 +552,14 @@ parse_pw_debug_env(void) } else if (n_tok == 1 && parse_log_level(tok[0], &lvl)) { pw_log_set_level(lvl); } 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(tokens); -out: pos += spa_scnprintf(pos, end - pos, "]"); return strdup(json); }