From cedf50888660476ebc5a239fbcfac665574bc0b3 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 7 Feb 2018 15:08:18 +0100 Subject: [PATCH] core: simplify manager_recheck_journal() a bit No need for an if check if we just pass along a bool anyway. --- src/core/manager.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c index 9c68eb49d1..e83a0dd5e6 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -3601,16 +3601,10 @@ void manager_recheck_journal(Manager *m) { if (getpid_cached() != 1) return; - if (manager_journal_is_running(m)) { - - /* The journal is fully and entirely up? If so, let's permit logging to it, if that's configured. */ - log_set_prohibit_ipc(false); - } else { - - /* If the journal is down, don't ever log to it, otherwise we might end up deadlocking ourselves as we - * might trigger an activation ourselves we can't fulfill */ - log_set_prohibit_ipc(true); - } + /* The journal is fully and entirely up? If so, let's permit logging to it, if that's configured. If the + * journal is down, don't ever log to it, otherwise we might end up deadlocking ourselves as we might trigger + * an activation ourselves we can't fulfill. */ + log_set_prohibit_ipc(!manager_journal_is_running(m)); log_open(); }