core: turn our four vacuum calls into a new helper function

Just share some code. No functional changes.

diff --git a/src/core/manager.c b/src/core/manager.c
index 0282ae32538430ed6f38037a6d7daee2d2712ce7..d12d07707aa621591f081a649b6dde76e426c8fd 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1581,6 +1581,20 @@ static void manager_preset_all(Manager *m) {
                 log_info("Populated /etc with preset unit settings.");
 }
 
+static void manager_vacuum(Manager *m) {
+        assert(m);
+
+        /* Release any dynamic users no longer referenced */
+        dynamic_user_vacuum(m, true);
+
+        /* Release any references to UIDs/GIDs no longer referenced, and destroy any IPC owned by them */
+        manager_vacuum_uid_refs(m);
+        manager_vacuum_gid_refs(m);
+
+        /* Release any runtimes no longer referenced */
+        exec_runtime_vacuum(m);
+}
+
 int manager_startup(Manager *m, FILE *serialization, FDSet *fds) {
         int r;
 
@@ -1662,14 +1676,8 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds) {
         /* Third, fire things up! */
         manager_coldplug(m);
 
-        /* Release any dynamic users no longer referenced */
-        dynamic_user_vacuum(m, true);
-
-        /* Release any references to UIDs/GIDs no longer referenced, and destroy any IPC owned by them */
-        manager_vacuum_uid_refs(m);
-        manager_vacuum_gid_refs(m);
-
-        exec_runtime_vacuum(m);
+        /* Clean up runtime objects */
+        manager_vacuum(m);
 
         if (serialization) {
                 assert(m->n_reloading > 0);
@@ -3540,14 +3548,8 @@ int manager_reload(Manager *m) {
         /* Third, fire things up! */
         manager_coldplug(m);
 
-        /* Release any dynamic users no longer referenced */
-        dynamic_user_vacuum(m, true);
-
-        /* Release any references to UIDs/GIDs no longer referenced, and destroy any IPC owned by them */
-        manager_vacuum_uid_refs(m);
-        manager_vacuum_gid_refs(m);
-
-        exec_runtime_vacuum(m);
+        /* Clean up runtime objects no longer referenced */
+        manager_vacuum(m);
 
         /* Consider the reload process complete now. */
         assert(m->n_reloading > 0);