From 3ceb347130e6a3cb1df46e621e2bee8e925577f4 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 11 Jun 2020 11:56:11 +0200 Subject: [PATCH] pid1: introduce an helper to handle the show-status marker No functional change. --- src/core/manager.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c index ecca2f71978..d64fa6fd21b 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -4284,6 +4284,13 @@ bool manager_get_show_status_on(Manager *m) { return show_status_on(manager_get_show_status(m)); } +static void set_show_status_marker(bool b) { + if (b) + (void) touch("/run/systemd/show-status"); + else + (void) unlink("/run/systemd/show-status"); +} + void manager_set_show_status(Manager *m, ShowStatus mode, const char *reason) { assert(m); assert(reason); @@ -4304,10 +4311,7 @@ void manager_set_show_status(Manager *m, ShowStatus mode, const char *reason) { strna(show_status_to_string(mode)), reason); - if (enabled) - (void) touch("/run/systemd/show-status"); - else - (void) unlink("/run/systemd/show-status"); + set_show_status_marker(enabled); } m->show_status = mode; @@ -4333,11 +4337,7 @@ void manager_set_show_status_overridden(Manager *m, ShowStatus mode, const char strna(show_status_to_string(mode)), reason); - if (show_status_on(mode)) - (void) touch("/run/systemd/show-status"); - else - (void) unlink("/run/systemd/show-status"); - + set_show_status_marker(show_status_on(mode)); } const char *manager_get_confirm_spawn(Manager *m) {