From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 6 Jan 2022 12:21:41 +0000 (+0900)
Subject: pid1: voidify manager_override_watchdog()
X-Git-Tag: v251-rc1~546^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F22037%2Fhead;p=thirdparty%2Fsystemd.git

pid1: voidify manager_override_watchdog()

As it always returns 0.
---

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 9b64a8074d9..8dbb61eb054 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -314,7 +314,8 @@ static int property_set_watchdog(Manager *m, WatchdogType type, sd_bus_message *
         if (r < 0)
                 return r;
 
-        return manager_override_watchdog(m, type, timeout);
+        manager_override_watchdog(m, type, timeout);
+        return 0;
 }
 
 static int property_set_runtime_watchdog(
diff --git a/src/core/manager.c b/src/core/manager.c
index 12c49e7fca4..8841be4a72d 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -3239,15 +3239,15 @@ void manager_set_watchdog(Manager *m, WatchdogType t, usec_t timeout) {
         m->watchdog[t] = timeout;
 }
 
-int manager_override_watchdog(Manager *m, WatchdogType t, usec_t timeout) {
+void manager_override_watchdog(Manager *m, WatchdogType t, usec_t timeout) {
 
         assert(m);
 
         if (MANAGER_IS_USER(m))
-                return 0;
+                return;
 
         if (m->watchdog_overridden[t] == timeout)
-                return 0;
+                return;
 
         if (t == WATCHDOG_RUNTIME) {
                 usec_t usec = timestamp_is_set(timeout) ? timeout : m->watchdog[t];
@@ -3256,7 +3256,6 @@ int manager_override_watchdog(Manager *m, WatchdogType t, usec_t timeout) {
         }
 
         m->watchdog_overridden[t] = timeout;
-        return 0;
 }
 
 int manager_reload(Manager *m) {
diff --git a/src/core/manager.h b/src/core/manager.h
index e445e4d7517..8f9984aa51b 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -573,7 +573,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_override_watchdog(Manager *m, WatchdogType t, usec_t timeout);
+void 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_;