Merge pull request #1691 from poettering/util-lib-3

split up util.h and macro.h into even more bits

4 files changed, 8 insertions, 3 deletions

diff --git a/src/timesync/timesyncd-conf.c b/src/timesync/timesyncd-conf.c
index ad6fd180e4..be651fc636 100644
--- a/src/timesync/timesyncd-conf.c
+++ b/src/timesync/timesyncd-conf.c
@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "string-util.h"
 #include "timesyncd-manager.h"
 #include "timesyncd-server.h"
@@ -35,16 +36,16 @@ int manager_parse_server_string(Manager *m, ServerType type, const char *string)
         first = type == SERVER_FALLBACK ? m->fallback_servers : m->system_servers;
 
         for (;;) {
-                _cleanup_free_ char *word;
+                _cleanup_free_ char *word = NULL;
                 bool found = false;
                 ServerName *n;
 
                 r = extract_first_word(&string, &word, NULL, 0);
                 if (r < 0)
                         return log_error_errno(r, "Failed to parse timesyncd server syntax \"%s\": %m", string);
-
                 if (r == 0)
                         break;
+
                 /* Filter out duplicates */
                 LIST_FOREACH(names, n, first)
                         if (streq_ptr(n->string, word)) {
diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index d44cf0a80b..b4995c3064 100644
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -33,7 +33,9 @@
 
 #include "sd-daemon.h"
 
+#include "alloc-util.h"
 #include "fd-util.h"
+#include "fs-util.h"
 #include "list.h"
 #include "log.h"
 #include "missing.h"
diff --git a/src/timesync/timesyncd-server.c b/src/timesync/timesyncd-server.c
index ec3fe1fc4e..f98e6b4cf0 100644
--- a/src/timesync/timesyncd-server.c
+++ b/src/timesync/timesyncd-server.c
@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "timesyncd-server.h"
 
 int server_address_new(
diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index 7a0ab18ca0..7f70eaaea0 100644
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -22,9 +22,10 @@
 #include "sd-daemon.h"
 #include "sd-event.h"
 
-#include "capability.h"
+#include "capability-util.h"
 #include "clock-util.h"
 #include "fd-util.h"
+#include "fs-util.h"
 #include "network-util.h"
 #include "signal-util.h"
 #include "timesyncd-conf.h"