]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #20738 from mrc0mmand/ci-llvm-13
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 16 Sep 2021 00:32:21 +0000 (09:32 +0900)
committerGitHub <noreply@github.com>
Thu, 16 Sep 2021 00:32:21 +0000 (09:32 +0900)
ci: build with clang-13

1  2 
src/core/manager.c
src/partition/repart.c

index cb07d3c6d52b82a05a7747669aff9f5a48d6b5f8,60939b56aff09c22a01ce5c1eba04123ccc555c8..1e091fd988022d499046a0962a6f6d06002fe571
@@@ -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;
Simple merge