From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 20 Dec 2024 14:02:16 +0000 (+0100)
Subject: test-watchdog: modernize
X-Git-Tag: v258-rc1~1012^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=839db33687e4751f3dd0b210d8b82339c17e7dd7;p=thirdparty%2Fsystemd.git

test-watchdog: modernize
---

diff --git a/src/test/test-watchdog.c b/src/test/test-watchdog.c
index 70d069c08b5..1eb284cd29d 100644
--- a/src/test/test-watchdog.c
+++ b/src/test/test-watchdog.c
@@ -8,26 +8,24 @@
 #include "watchdog.h"
 
 int main(int argc, char *argv[]) {
-        usec_t t;
-        unsigned i, count;
         int r;
-        bool slow;
 
         test_setup_logging(LOG_DEBUG);
 
-        slow = slow_tests_enabled();
+        bool slow = slow_tests_enabled();
 
-        t = slow ? 10 * USEC_PER_SEC : 2 * USEC_PER_SEC;
-        count = slow ? 5 : 3;
+        usec_t timeout = slow ? 10 * USEC_PER_SEC : 2 * USEC_PER_SEC;
+        unsigned count = slow ? 5 : 3;
 
-        r = watchdog_setup(t);
+        log_info("Initializing watchdog with timeout of %s", FORMAT_TIMESPAN(timeout, USEC_PER_SEC));
+        r = watchdog_setup(timeout);
         if (r < 0)
                 log_warning_errno(r, "Failed to open watchdog: %m");
 
-        for (i = 0; i < count; i++) {
-                t = watchdog_runtime_wait();
-                log_info("Sleeping " USEC_FMT " microseconds...", t);
-                usleep_safe(t);
+        for (unsigned i = 0; i < count; i++) {
+                timeout = watchdog_runtime_wait();
+                log_info("Sleeping %s…", FORMAT_TIMESPAN(timeout, USEC_PER_SEC));
+                usleep_safe(timeout);
                 log_info("Pinging...");
                 r = watchdog_ping();
                 if (r < 0)