core: add manager_status_printf()

unit_status_printf() checks the state of the manager, not of the unit
as such. Move it to manager.c and rename it to manager_status_printf().

Temporarily keep unit_status_printf as a wrapper macro.

diff --git a/src/core/manager.c b/src/core/manager.c
index a578813617fba45d229ff65714844be30a9468af..d6c6e2de6d2dfe6823dc01057d9a9a61f4a72b28 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2494,6 +2494,20 @@ bool manager_get_show_status(Manager *m) {
         return plymouth_running();
 }
 
         return plymouth_running();
 }
 

+void manager_status_printf(Manager *m, const char *status, const char *format, ...) {
+        va_list ap;
+
+        if (!manager_get_show_status(m))
+                return;
+
+        if (!manager_is_booting_or_shutting_down(m))
+                return;
+
+        va_start(ap, format);
+        status_vprintf(status, true, format, ap);
+        va_end(ap);
+}
+

 void watch_init(Watch *w) {
         assert(w);
 
 void watch_init(Watch *w) {
         assert(w);
 

diff --git a/src/core/manager.h b/src/core/manager.h
index 0bd7a6d48b5fa8043233000a67e3722864a9e64c..3ec8d707d2887705c4d05ea8481701c3cc210ec3 100644 (file)
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -295,6 +295,7 @@ void manager_undo_generators(Manager *m);
 void manager_recheck_journal(Manager *m);
 
 void manager_set_show_status(Manager *m, bool b);
 void manager_recheck_journal(Manager *m);
 
 void manager_set_show_status(Manager *m, bool b);

+void manager_status_printf(Manager *m, const char *status, const char *format, ...);

 bool manager_get_show_status(Manager *m);
 
 void watch_init(Watch *w);
 bool manager_get_show_status(Manager *m);
 
 void watch_init(Watch *w);

diff --git a/src/core/unit.c b/src/core/unit.c
index 370ad67e592be4cdac9b4f84ee7089583648a375..74b0e47885cad3b450be0fce5c65b4688a96e9be 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2535,23 +2535,6 @@ int unit_coldplug(Unit *u) {
         return 0;
 }
 
         return 0;
 }
 

-void unit_status_printf(Unit *u, const char *status, const char *format, ...) {
-        va_list ap;
-
-        assert(u);
-        assert(format);
-
-        if (!manager_get_show_status(u->manager))
-                return;
-
-        if (!manager_is_booting_or_shutting_down(u->manager))
-                return;
-
-        va_start(ap, format);
-        status_vprintf(status, true, format, ap);
-        va_end(ap);
-}
-

 bool unit_need_daemon_reload(Unit *u) {
         struct stat st;
 
 bool unit_need_daemon_reload(Unit *u) {
         struct stat st;
 

diff --git a/src/core/unit.h b/src/core/unit.h
index 17a5a5f0d94b194c5e7e9f7cff28504b8f17e72f..84aabd572321098f9e6a0beb20e53dee5dc30ce6 100644 (file)
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -520,7 +520,8 @@ int unit_add_node_link(Unit *u, const char *what, bool wants);
 
 int unit_coldplug(Unit *u);
 
 
 int unit_coldplug(Unit *u);
 

-void unit_status_printf(Unit *u, const char *status, const char *format, ...);
+#define unit_status_printf(u, st, fo, ...) \
+        manager_status_printf((u)->manager, st, fo, __VA_ARGS__)

 
 bool unit_need_daemon_reload(Unit *u);
 
 
 bool unit_need_daemon_reload(Unit *u);