util-lib: split string parsing related calls from util.[ch] into parse-util.[ch]

10 files changed, 16 insertions, 7 deletions

diff --git a/src/shared/apparmor-util.c b/src/shared/apparmor-util.c
index c2bbd330bd..48d0f84995 100644
--- a/src/shared/apparmor-util.c
+++ b/src/shared/apparmor-util.c
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-
-#include "util.h"
-#include "fileio.h"
 #include "apparmor-util.h"
+#include "fileio.h"
+#include "parse-util.h"
+#include "util.h"
 
 bool mac_apparmor_use(void) {
         static int cached_use = -1;
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 604b8f248a..53b9752af0 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -37,6 +37,7 @@
 #include "fd-util.h"
 #include "macro.h"
 #include "missing.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "set.h"
 #include "signal-util.h"
diff --git a/src/shared/condition.c b/src/shared/condition.c
index b8915dab8a..145ea41095 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -36,6 +36,7 @@
 #include "fd-util.h"
 #include "hostname-util.h"
 #include "ima-util.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "selinux-util.h"
 #include "smack-util.h"
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 1b47c0ab52..8bb33add72 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -27,16 +27,17 @@
 #include "sd-messages.h"
 
 #include "conf-files.h"
+#include "conf-parser.h"
+#include "fd-util.h"
 #include "log.h"
 #include "macro.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "signal-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "utf8.h"
 #include "util.h"
-#include "conf-parser.h"
-#include "fd-util.h"
 
 int config_item_table_lookup(
                 const void *table,
diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
index d4df9d2acb..a8176af840 100644
--- a/src/shared/dns-domain.c
+++ b/src/shared/dns-domain.c
@@ -24,8 +24,9 @@
 #include <stringprep.h>
 #endif
 
-#include "string-util.h"
 #include "dns-domain.h"
+#include "parse-util.h"
+#include "string-util.h"
 
 int dns_label_unescape(const char **name, char *dest, size_t sz) {
         const char *n;
diff --git a/src/shared/efivars.c b/src/shared/efivars.c
index 4808ede60c..771bc9458c 100644
--- a/src/shared/efivars.c
+++ b/src/shared/efivars.c
@@ -26,6 +26,7 @@
 #include "efivars.h"
 #include "fd-util.h"
 #include "io-util.h"
+#include "parse-util.h"
 #include "utf8.h"
 #include "util.h"
 #include "virt.h"
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index bdfc13e3cd..20fb0f5a06 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -19,11 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "fstab-util.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
-#include "fstab-util.h"
 
 bool fstab_is_mount_point(const char *mount) {
         _cleanup_endmntent_ FILE *f = NULL;
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index d8ea4c9f92..3519323b7a 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -33,6 +33,7 @@
 #include "journal-internal.h"
 #include "log.h"
 #include "logs-show.h"
+#include "parse-util.h"
 #include "process-util.h"
 #include "string-util.h"
 #include "terminal-util.h"
diff --git a/src/shared/machine-pool.c b/src/shared/machine-pool.c
index a2cb5fc5a0..c576242b59 100644
--- a/src/shared/machine-pool.c
+++ b/src/shared/machine-pool.c
@@ -29,6 +29,7 @@
 #include "lockfile-util.h"
 #include "machine-pool.h"
 #include "mkdir.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "signal-util.h"
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index b5cb9508bf..0e232e6aa6 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -29,6 +29,7 @@
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
+#include "parse-util.h"
 
 #define USE(x, y) do{ (x) = (y); (y) = NULL; } while(0)