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

One patch for test-execute and assorted cleanups

diff --cc src/core/execute.c
Simple merge

diff --cc src/core/manager.c
index b6165bd7e865e8578e1ce3658062f3d888568ae2,f73afe3ba91e6c16dadc7e36e0068cd28e4ee6c4..b3f6df8661f06f7abce9e412cafeafda24d28d1c
--- 1/src/core/manager.c
--- 2/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;