From 6bedfcbb2970e06a4d3280c8fb62083d252ede73 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 26 Oct 2015 16:18:16 +0100
Subject: util-lib: split string parsing related calls from util.[ch] into
 parse-util.[ch]

---
 src/core/automount.c     | 1 +
 src/core/busname.c       | 1 +
 src/core/cgroup.c        | 1 +
 src/core/dbus-execute.c  | 6 +++---
 src/core/device.c        | 3 ++-
 src/core/execute.c       | 1 +
 src/core/job.c           | 3 ++-
 src/core/killall.c       | 1 +
 src/core/load-fragment.c | 1 +
 src/core/main.c          | 1 +
 src/core/manager.c       | 1 +
 src/core/mount.c         | 1 +
 src/core/service.c       | 1 +
 src/core/show-status.c   | 3 ++-
 src/core/shutdown.c      | 1 +
 src/core/snapshot.c      | 4 +++-
 src/core/snapshot.h      | 2 ++
 src/core/socket.c        | 1 +
 src/core/swap.c          | 1 +
 src/core/timer.c         | 1 +
 src/core/unit.c          | 1 +
 21 files changed, 29 insertions(+), 7 deletions(-)

(limited to 'src/core')

diff --git a/src/core/automount.c b/src/core/automount.c
index d362d6579d..2ee32312fb 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -40,6 +40,7 @@
 #include "label.h"
 #include "mkdir.h"
 #include "mount.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "special.h"
diff --git a/src/core/busname.c b/src/core/busname.c
index 335a1fdc4c..df4a8bef52 100644
--- a/src/core/busname.c
+++ b/src/core/busname.c
@@ -30,6 +30,7 @@
 #include "fd-util.h"
 #include "formats-util.h"
 #include "kdbus.h"
+#include "parse-util.h"
 #include "service.h"
 #include "signal-util.h"
 #include "special.h"
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 2a2cf02774..a33eaa8d42 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -25,6 +25,7 @@
 #include "cgroup-util.h"
 #include "cgroup.h"
 #include "fd-util.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "special.h"
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index 6f1e0dc6ac..a7fbd71144 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -36,13 +36,13 @@
 #include "ioprio.h"
 #include "missing.h"
 #include "namespace.h"
+#include "parse-util.h"
 #include "path-util.h"
-#include "strv.h"
-#include "utf8.h"
-
 #ifdef HAVE_SECCOMP
 #include "seccomp-util.h"
 #endif
+#include "strv.h"
+#include "utf8.h"
 
 BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput);
 
diff --git a/src/core/device.c b/src/core/device.c
index 9127d2d225..fb467a4876 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -25,14 +25,15 @@
 #include "libudev.h"
 
 #include "dbus-device.h"
+#include "device.h"
 #include "log.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "string-util.h"
 #include "swap.h"
 #include "udev-util.h"
 #include "unit-name.h"
 #include "unit.h"
-#include "device.h"
 
 static const UnitActiveState state_translation_table[_DEVICE_STATE_MAX] = {
         [DEVICE_DEAD] = UNIT_INACTIVE,
diff --git a/src/core/execute.c b/src/core/execute.c
index 3f2607ff1a..24a8e646ad 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -76,6 +76,7 @@
 #include "missing.h"
 #include "mkdir.h"
 #include "namespace.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "rm-rf.h"
diff --git a/src/core/job.c b/src/core/job.c
index 8a0e0a0ea4..7fde88f5fe 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -28,8 +28,10 @@
 #include "dbus-job.h"
 #include "dbus.h"
 #include "escape.h"
+#include "job.h"
 #include "log.h"
 #include "macro.h"
+#include "parse-util.h"
 #include "set.h"
 #include "special.h"
 #include "string-util.h"
@@ -37,7 +39,6 @@
 #include "terminal-util.h"
 #include "unit.h"
 #include "virt.h"
-#include "job.h"
 
 Job* job_new_raw(Unit *unit) {
         Job *j;
diff --git a/src/core/killall.c b/src/core/killall.c
index cb11987166..dbfa90ebac 100644
--- a/src/core/killall.c
+++ b/src/core/killall.c
@@ -27,6 +27,7 @@
 #include "fd-util.h"
 #include "formats-util.h"
 #include "killall.h"
+#include "parse-util.h"
 #include "process-util.h"
 #include "set.h"
 #include "string-util.h"
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 31fdc48823..f5c28e514f 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -48,6 +48,7 @@
 #include "load-fragment.h"
 #include "log.h"
 #include "missing.h"
+#include "parse-util.h"
 #include "path-util.h"
 #ifdef HAVE_SECCOMP
 #include "seccomp-util.h"
diff --git a/src/core/main.c b/src/core/main.c
index b0ca6fa10e..a8834b6f0b 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -67,6 +67,7 @@
 #include "missing.h"
 #include "mount-setup.h"
 #include "pager.h"
+#include "parse-util.h"
 #include "process-util.h"
 #include "selinux-setup.h"
 #include "selinux-util.h"
diff --git a/src/core/manager.c b/src/core/manager.c
index 287676ff27..9ad8a136ab 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -62,6 +62,7 @@
 #include "manager.h"
 #include "missing.h"
 #include "mkdir.h"
+#include "parse-util.h"
 #include "path-lookup.h"
 #include "path-util.h"
 #include "process-util.h"
diff --git a/src/core/mount.c b/src/core/mount.c
index ebdb3503e9..59f56bdefa 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -36,6 +36,7 @@
 #include "mkdir.h"
 #include "mount-setup.h"
 #include "mount.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "smack-util.h"
 #include "special.h"
diff --git a/src/core/service.c b/src/core/service.c
index abcbd4954f..d5bd8869da 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -39,6 +39,7 @@
 #include "load-fragment.h"
 #include "log.h"
 #include "manager.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "service.h"
diff --git a/src/core/show-status.c b/src/core/show-status.c
index 7951ea7303..9e4c9f563e 100644
--- a/src/core/show-status.c
+++ b/src/core/show-status.c
@@ -19,9 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "parse-util.h"
+#include "show-status.h"
 #include "string-util.h"
 #include "util.h"
-#include "show-status.h"
 
 int parse_show_status(const char *v, ShowStatus *ret) {
         int r;
diff --git a/src/core/shutdown.c b/src/core/shutdown.c
index 33383a4b0b..93bbc315d3 100644
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@ -37,6 +37,7 @@
 #include "killall.h"
 #include "log.h"
 #include "missing.h"
+#include "parse-util.h"
 #include "process-util.h"
 #include "string-util.h"
 #include "switch-root.h"
diff --git a/src/core/snapshot.c b/src/core/snapshot.c
index 15726c344e..da1c99ad12 100644
--- a/src/core/snapshot.c
+++ b/src/core/snapshot.c
@@ -23,10 +23,12 @@
 
 #include "bus-common-errors.h"
 #include "dbus-snapshot.h"
+#include "parse-util.h"
+#include "parse-util.h"
+#include "snapshot.h"
 #include "string-util.h"
 #include "unit-name.h"
 #include "unit.h"
-#include "snapshot.h"
 
 static const UnitActiveState state_translation_table[_SNAPSHOT_STATE_MAX] = {
         [SNAPSHOT_DEAD] = UNIT_INACTIVE,
diff --git a/src/core/snapshot.h b/src/core/snapshot.h
index 97747e18bd..bd52dea408 100644
--- a/src/core/snapshot.h
+++ b/src/core/snapshot.h
@@ -23,6 +23,8 @@
 
 typedef struct Snapshot Snapshot;
 
+#include "unit.h"
+
 struct Snapshot {
         Unit meta;
 
diff --git a/src/core/socket.c b/src/core/socket.c
index 7f401025ed..49cef210dc 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -43,6 +43,7 @@
 #include "log.h"
 #include "missing.h"
 #include "mkdir.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "selinux-util.h"
 #include "signal-util.h"
diff --git a/src/core/swap.c b/src/core/swap.c
index d864c7b304..c4151c6afd 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -32,6 +32,7 @@
 #include "fd-util.h"
 #include "formats-util.h"
 #include "fstab-util.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "special.h"
 #include "string-util.h"
diff --git a/src/core/timer.c b/src/core/timer.c
index 908d45ac73..3ece2e056d 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -24,6 +24,7 @@
 #include "bus-error.h"
 #include "bus-util.h"
 #include "dbus-timer.h"
+#include "parse-util.h"
 #include "special.h"
 #include "string-util.h"
 #include "timer.h"
diff --git a/src/core/unit.c b/src/core/unit.c
index 572b1c1b78..17c135cf3f 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -44,6 +44,7 @@
 #include "macro.h"
 #include "missing.h"
 #include "mkdir.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "set.h"
-- 
cgit v1.2.3-54-g00ecf