From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 8 Sep 2020 16:33:12 +0000 (+0200)
Subject: Merge pull request #16955 from keszybz/test-execute-cleanup
X-Git-Tag: v247-rc1~282
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6552f7cd574a693d921176796057b50ced2b4f5;p=thirdparty%2Fsystemd.git

Merge pull request #16955 from keszybz/test-execute-cleanup

One patch for test-execute and assorted cleanups
---

c6552f7cd574a693d921176796057b50ced2b4f5
diff --cc src/core/manager.c
index b6165bd7e86,f73afe3ba91..b3f6df8661f
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@@ -1895,11 -1900,12 +1894,11 @@@ static int manager_dispatch_target_deps
                  LIST_REMOVE(target_deps_queue, u->manager->target_deps_queue, u);
                  u->in_target_deps_queue = false;
  
-                 for (k = 0; k < ELEMENTSOF(deps); k++) {
+                 for (size_t k = 0; k < ELEMENTSOF(deps); k++) {
                          Unit *target;
 -                        Iterator i;
                          void *v;
  
 -                        HASHMAP_FOREACH_KEY(v, target, u->dependencies[deps[k]], i) {
 +                        HASHMAP_FOREACH_KEY(v, target, u->dependencies[deps[k]]) {
                                  r = unit_add_default_target_dependency(u, target);
                                  if (r < 0)
                                          return r;
@@@ -3216,8 -3225,8 +3213,7 @@@ int manager_serialize
                  FDSet *fds,
                  bool switching_root) {
  
-         ManagerTimestamp q;
          const char *t;
 -        Iterator i;
          Unit *u;
          int r;