From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 16 Sep 2021 00:32:21 +0000 (+0900)
Subject: Merge pull request #20738 from mrc0mmand/ci-llvm-13
X-Git-Tag: v250-rc1~663
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73bf0f2ace1472ceb72295e0fe5e425998af8a86;p=thirdparty%2Fsystemd.git

Merge pull request #20738 from mrc0mmand/ci-llvm-13

ci: build with clang-13
---

73bf0f2ace1472ceb72295e0fe5e425998af8a86
diff --cc src/core/manager.c
index cb07d3c6d52,60939b56aff..1e091fd9880
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@@ -3236,8 -3259,23 +3236,8 @@@ int manager_override_watchdog(Manager *
          return 0;
  }
  
 -void manager_retry_runtime_watchdog(Manager *m) {
 -        int r = 0;
 -
 -        assert(m);
 -
 -        if (timestamp_is_set(m->watchdog_overridden[WATCHDOG_RUNTIME]))
 -                r = watchdog_set_timeout(&m->watchdog_overridden[WATCHDOG_RUNTIME]);
 -        else
 -                r = watchdog_set_timeout(&m->watchdog[WATCHDOG_RUNTIME]);
 -
 -        if (r >= 0)
 -                m->runtime_watchdog_running = true;
 -}
 -
  int manager_reload(Manager *m) {
-         _cleanup_(manager_reloading_stopp) Manager *reloading = NULL;
+         _unused_ _cleanup_(manager_reloading_stopp) Manager *reloading = NULL;
          _cleanup_fdset_free_ FDSet *fds = NULL;
          _cleanup_fclose_ FILE *f = NULL;
          int r;