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.
This commit is contained in:
parent
637f8b8eb5
commit
25cee55076
|
@ -2494,6 +2494,20 @@ bool manager_get_show_status(Manager *m) {
|
|||
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);
|
||||
|
||||
|
|
|
@ -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_status_printf(Manager *m, const char *status, const char *format, ...);
|
||||
bool manager_get_show_status(Manager *m);
|
||||
|
||||
void watch_init(Watch *w);
|
||||
|
|
|
@ -2535,23 +2535,6 @@ int unit_coldplug(Unit *u) {
|
|||
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;
|
||||
|
||||
|
|
|
@ -520,7 +520,8 @@ int unit_add_node_link(Unit *u, const char *what, bool wants);
|
|||
|
||||
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);
|
||||
|
||||
|
|
Loading…
Reference in New Issue