From 43bba15ac8d12dc5e51bc9c1b2d01f6a5c6481e6 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 4 Jun 2020 13:25:25 +0200 Subject: [PATCH] pid1: rename manager_set_{show_status,watchdog}_overridden() into manager_override_(show_status,watchdog} No functional change. --- src/core/dbus-manager.c | 4 ++-- src/core/manager.c | 16 ++++++++-------- src/core/manager.h | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index d48f529af8..0cf3337760 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -309,7 +309,7 @@ static int property_set_watchdog(Manager *m, WatchdogType type, sd_bus_message * if (r < 0) return r; - return manager_set_watchdog_overridden(m, type, timeout); + return manager_override_watchdog(m, type, timeout); } static int property_set_runtime_watchdog( @@ -2469,7 +2469,7 @@ static int method_set_show_status(sd_bus_message *message, void *userdata, sd_bu return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid show status '%s'", t); } - manager_set_show_status_overridden(m, mode, "bus"); + manager_override_show_status(m, mode, "bus"); return sd_bus_reply_method_return(message, NULL); } diff --git a/src/core/manager.c b/src/core/manager.c index d64fa6fd21..959181d204 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -2761,11 +2761,11 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t switch (sfsi.ssi_signo - SIGRTMIN) { case 20: - manager_set_show_status_overridden(m, SHOW_STATUS_YES, "signal"); + manager_override_show_status(m, SHOW_STATUS_YES, "signal"); break; case 21: - manager_set_show_status_overridden(m, SHOW_STATUS_NO, "signal"); + manager_override_show_status(m, SHOW_STATUS_NO, "signal"); break; case 22: @@ -3401,7 +3401,7 @@ void manager_set_watchdog(Manager *m, WatchdogType t, usec_t timeout) { m->watchdog[t] = timeout; } -int manager_set_watchdog_overridden(Manager *m, WatchdogType t, usec_t timeout) { +int manager_override_watchdog(Manager *m, WatchdogType t, usec_t timeout) { int r = 0; assert(m); @@ -3577,7 +3577,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) { if (s < 0) log_notice("Failed to parse show-status-overridden flag '%s', ignoring.", val); else - manager_set_show_status_overridden(m, s, "deserialize"); + manager_override_show_status(m, s, "deserialize"); } else if ((val = startswith(l, "log-level-override="))) { int level; @@ -3603,7 +3603,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) { if (deserialize_usec(val, &t) < 0) log_notice("Failed to parse runtime-watchdog-overridden value '%s', ignoring.", val); else - manager_set_watchdog_overridden(m, WATCHDOG_RUNTIME, t); + manager_override_watchdog(m, WATCHDOG_RUNTIME, t); } else if ((val = startswith(l, "reboot-watchdog-overridden="))) { usec_t t; @@ -3611,7 +3611,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) { if (deserialize_usec(val, &t) < 0) log_notice("Failed to parse reboot-watchdog-overridden value '%s', ignoring.", val); else - manager_set_watchdog_overridden(m, WATCHDOG_REBOOT, t); + manager_override_watchdog(m, WATCHDOG_REBOOT, t); } else if ((val = startswith(l, "kexec-watchdog-overridden="))) { usec_t t; @@ -3619,7 +3619,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) { if (deserialize_usec(val, &t) < 0) log_notice("Failed to parse kexec-watchdog-overridden value '%s', ignoring.", val); else - manager_set_watchdog_overridden(m, WATCHDOG_KEXEC, t); + manager_override_watchdog(m, WATCHDOG_KEXEC, t); } else if (startswith(l, "env=")) { r = deserialize_environment(l + 4, &m->client_environment); @@ -4317,7 +4317,7 @@ void manager_set_show_status(Manager *m, ShowStatus mode, const char *reason) { m->show_status = mode; } -void manager_set_show_status_overridden(Manager *m, ShowStatus mode, const char *reason) { +void manager_override_show_status(Manager *m, ShowStatus mode, const char *reason) { assert(m); assert(mode < _SHOW_STATUS_MAX); diff --git a/src/core/manager.h b/src/core/manager.h index 259548e241..2cd0dacdb0 100644 --- a/src/core/manager.h +++ b/src/core/manager.h @@ -515,7 +515,7 @@ void manager_recheck_journal(Manager *m); bool manager_get_show_status_on(Manager *m); void manager_set_show_status(Manager *m, ShowStatus mode, const char *reason); -void manager_set_show_status_overridden(Manager *m, ShowStatus mode, const char *reason); +void manager_override_show_status(Manager *m, ShowStatus mode, const char *reason); void manager_set_first_boot(Manager *m, bool b); @@ -557,7 +557,7 @@ ManagerTimestamp manager_timestamp_initrd_mangle(ManagerTimestamp s); usec_t manager_get_watchdog(Manager *m, WatchdogType t); void manager_set_watchdog(Manager *m, WatchdogType t, usec_t timeout); -int manager_set_watchdog_overridden(Manager *m, WatchdogType t, usec_t timeout); +int manager_override_watchdog(Manager *m, WatchdogType t, usec_t timeout); const char* oom_policy_to_string(OOMPolicy i) _const_; OOMPolicy oom_policy_from_string(const char *s) _pure_;