X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fmanager.c;h=07ca4c92f738fc6e6dd15975b15cf667050ed20e;hp=c75c1e1a4ebace040fc5753131d549dde5352147;hb=9588bc32096fc8342bfd8b989689717186d7d86e;hpb=f842cd74eacc2960ac849766eb786059317415ee

diff --git a/src/core/manager.c b/src/core/manager.c
index c75c1e1a4..07ca4c92f 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -800,7 +800,7 @@ int manager_enumerate(Manager *m) {
         return r;
 }
 
-int manager_coldplug(Manager *m) {
+static int manager_coldplug(Manager *m) {
         int r = 0, q;
         Iterator i;
         Unit *u;
@@ -880,6 +880,29 @@ fail:
         m->unit_path_cache = NULL;
 }
 
+
+static int manager_distribute_fds(Manager *m, FDSet *fds) {
+        Unit *u;
+        Iterator i;
+        int r;
+
+        assert(m);
+
+        HASHMAP_FOREACH(u, m->units, i) {
+
+                if (fdset_size(fds) <= 0)
+                        break;
+
+                if (UNIT_VTABLE(u)->distribute_fds) {
+                        r = UNIT_VTABLE(u)->distribute_fds(u, fds);
+                        if (r < 0)
+                                return r;
+                }
+        }
+
+        return 0;
+}
+
 int manager_startup(Manager *m, FILE *serialization, FDSet *fds) {
         int r, q;
 
@@ -1187,7 +1210,7 @@ void manager_clear_jobs(Manager *m) {
                 job_finish_and_invalidate(j, JOB_CANCELED, false);
 }
 
-unsigned manager_dispatch_run_queue(Manager *m) {
+static unsigned manager_dispatch_run_queue(Manager *m) {
         Job *j;
         unsigned n = 0;
 
@@ -1215,7 +1238,7 @@ unsigned manager_dispatch_run_queue(Manager *m) {
         return n;
 }
 
-unsigned manager_dispatch_dbus_queue(Manager *m) {
+static unsigned manager_dispatch_dbus_queue(Manager *m) {
         Job *j;
         Unit *u;
         unsigned n = 0;
@@ -2298,28 +2321,6 @@ finish:
         return r;
 }
 
-int manager_distribute_fds(Manager *m, FDSet *fds) {
-        Unit *u;
-        Iterator i;
-        int r;
-
-        assert(m);
-
-        HASHMAP_FOREACH(u, m->units, i) {
-
-                if (fdset_size(fds) <= 0)
-                        break;
-
-                if (UNIT_VTABLE(u)->distribute_fds) {
-                        r = UNIT_VTABLE(u)->distribute_fds(u, fds);
-                        if (r < 0)
-                                return r;
-                }
-        }
-
-        return 0;
-}
-
 int manager_reload(Manager *m) {
         int r, q;
         _cleanup_fclose_ FILE *f = NULL;