From fd2cc19eaa5d9256e5821199c5954104af301e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Do=C4=9Fukan=20Korkmazt=C3=BCrk?= Date: Mon, 11 Jul 2022 12:38:42 -0400 Subject: [PATCH] pipewire: fix a bugprone-branch-clone warning A clang-tidy bugprone-branch-clone warning has been fixed and branches are made more uniform --- src/pipewire/pipewire.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/pipewire/pipewire.c b/src/pipewire/pipewire.c index 4561ba7bd..255760c90 100644 --- a/src/pipewire/pipewire.c +++ b/src/pipewire/pipewire.c @@ -826,8 +826,7 @@ bool pw_check_option(const char *option, const char *value) return global_support.no_color == spa_atob(value); else if (spa_streq(option, "no-config")) return global_support.no_config == spa_atob(value); - else - return false; + return false; } /** Get the client name @@ -841,15 +840,11 @@ const char *pw_get_client_name(void) const char *cc; static char cname[256]; - if ((cc = pw_get_application_name())) + if ((cc = pw_get_application_name()) || (cc = pw_get_prgname())) return cc; - else if ((cc = pw_get_prgname())) - return cc; - else { - if (snprintf(cname, sizeof(cname), "pipewire-pid-%zd", (size_t) getpid()) < 0) - return NULL; - return cname; - } + else if (snprintf(cname, sizeof(cname), "pipewire-pid-%zd", (size_t) getpid()) < 0) + return NULL; + return cname; } /** Reverse the direction */