util-lib: don't include fileio.h from fileio-label.h

There's no reason for doing that, hence simply don't.

diff --git a/src/core/unit.c b/src/core/unit.c
index 89bb95e2f1cf136d00b5098fd37770a3601df0d5..d58f2eaacf45d3a7fa22b76ad5e3e708a41423c3 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -22,6 +22,7 @@
 #include "execute.h"
 #include "fd-util.h"
 #include "fileio-label.h"
+#include "fileio.h"
 #include "format-util.h"
 #include "fs-util.h"
 #include "id128-util.h"

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index d14073ace052a07a7692dd6ab844ab6fcf3995b4..bf1c00b4aa10d878139fff87148d8cb6ceb0cfb4 100644 (file)
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -11,6 +11,7 @@
 #include "def.h"
 #include "env-util.h"
 #include "fileio-label.h"
+#include "fileio.h"
 #include "hostname-util.h"
 #include "id128-util.h"
 #include "main-func.h"

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index ab4561a555d6690b3deab69e948ea884d33d5502..0858fbd96c37c96800d889a253bebe4cde07a8da 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -21,6 +21,7 @@
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio-label.h"
+#include "fileio.h"
 #include "format-util.h"
 #include "fs-util.h"
 #include "logind.h"

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 0fdc84d57af14e8d686303e69f41caa1a488d04a..1b9e1435246fe8df3b2a4f8dddb5161b525f0d21 100644 (file)
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -14,7 +14,7 @@
 #include "dirent-util.h"
 #include "dns-domain.h"
 #include "fd-util.h"
-#include "fileio-label.h"
+#include "fileio.h"
 #include "hostname-util.h"
 #include "io-util.h"
 #include "io-util.h"

diff --git a/src/resolve/resolved-resolv-conf.c b/src/resolve/resolved-resolv-conf.c
index f8b5301c1ed8424469672cb29f9658df3fb15bf6..42225572f251206b68d38758d2f10d904363b1ed 100644 (file)
--- a/src/resolve/resolved-resolv-conf.c
+++ b/src/resolve/resolved-resolv-conf.c
@@ -6,7 +6,6 @@
 #include "alloc-util.h"
 #include "dns-domain.h"
 #include "fd-util.h"
-#include "fileio-label.h"
 #include "fileio.h"
 #include "ordered-set.h"
 #include "resolved-conf.h"

diff --git a/src/shared/fileio-label.h b/src/shared/fileio-label.h
index d11112debd6d8c56f06babf18364c384d55497c1..2347753fe4f8ee7a297806ceace7e3664a39a8d4 100644 (file)
--- a/src/shared/fileio-label.h
+++ b/src/shared/fileio-label.h
@@ -3,11 +3,9 @@
 
 #include <stdio.h>
 
-#include "fileio.h"
-
-/* These functions are split out of fileio.h (and not for examplement just as flags to the functions they wrap) in
- * order to optimize linking: This way, -lselinux is needed only for the callers of these functions that need selinux,
- * but not for all */
+/* These functions are split out of fileio.h (and not for example just flags to the functions they wrap) in order to
+ * optimize linking: This way, -lselinux is needed only for the callers of these functions that need selinux, but not
+ * for all */
 
 int write_string_file_atomic_label_ts(const char *fn, const char *line, struct timespec *ts);
 static inline int write_string_file_atomic_label(const char *fn, const char *line) {

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index c2326ee9b81f852aab416dfef1bc7376fe93424e..d0ab5a9b6ce686cc497166ebbdb9b46d0850f531 100644 (file)
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -8,7 +8,7 @@
 #include "copy.h"
 #include "def.h"
 #include "fd-util.h"
-#include "fileio-label.h"
+#include "fileio.h"
 #include "format-util.h"
 #include "fs-util.h"
 #include "hashmap.h"