label: Rename to label-util.h

diff --git a/src/core/automount.c b/src/core/automount.c
index 5df697bf22080e506aa24614e6484a684f636290..3254275d6b1c6d6858116c1a760a315177fa687e 100644 (file)
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -21,7 +21,7 @@
 #include "format-util.h"
 #include "fstab-util.h"
 #include "io-util.h"
-#include "label.h"
+#include "label-util.h"
 #include "mkdir-label.h"
 #include "mount-util.h"
 #include "mount.h"

diff --git a/src/core/execute.c b/src/core/execute.c
index 5e327465da7b6ca2e0d7dbc858e45afbb0ca764b..b2804e52e93e5568a379ebdbb29f7c8c8514b7c1 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -65,7 +65,7 @@
 #include "hexdecoct.h"
 #include "io-util.h"
 #include "ioprio-util.h"
-#include "label.h"
+#include "label-util.h"
 #include "log.h"
 #include "macro.h"
 #include "manager.h"

diff --git a/src/core/manager.c b/src/core/manager.c
index f8d469ebf64da8bfce565bf87e0f547936da70b5..78d1a032e6588c956276b31fd32e844a9f2ab444 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -54,7 +54,7 @@
 #include "inotify-util.h"
 #include "install.h"
 #include "io-util.h"
-#include "label.h"
+#include "label-util.h"
 #include "load-fragment.h"
 #include "locale-setup.h"
 #include "log.h"

diff --git a/src/core/namespace.c b/src/core/namespace.c
index 1116ece59d80675c05d4e0e4ec5b51c6d015e737..b00f27e08fbc2347a6757da92649bd6f4a474205 100644 (file)
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -22,7 +22,7 @@
 #include "fd-util.h"
 #include "format-util.h"
 #include "glyph-util.h"
-#include "label.h"
+#include "label-util.h"
 #include "list.h"
 #include "lock-util.h"
 #include "loop-util.h"

diff --git a/src/core/socket.c b/src/core/socket.c
index a6477de5a027d9a10d01e45de1e3056ba7ad6a27..7c596182c2b5f531a90bca61bde1a6f4852fb39f 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -26,7 +26,7 @@
 #include "in-addr-util.h"
 #include "io-util.h"
 #include "ip-protocol-list.h"
-#include "label.h"
+#include "label-util.h"
 #include "log.h"
 #include "mkdir-label.h"
 #include "parse-util.h"

diff --git a/src/core/unit.c b/src/core/unit.c
index 90f87a95f5e7d8b7443fcecd6eb2b99d94de1431..55bc926c2fe177236bdd5ce08578b19a32b669f2 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -32,7 +32,7 @@
 #include "id128-util.h"
 #include "install.h"
 #include "io-util.h"
-#include "label.h"
+#include "label-util.h"
 #include "load-dropin.h"
 #include "load-fragment.h"
 #include "log.h"

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 6161af9a7453b10f433d2b8544997c2c9be821b9..7a6056086aefba448b03ef2110ec262a7d2b5f8a 100644 (file)
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -17,7 +17,7 @@
 #include "format-util.h"
 #include "fs-util.h"
 #include "hashmap.h"
-#include "label.h"
+#include "label-util.h"
 #include "limits-util.h"
 #include "logind-dbus.h"
 #include "logind-user-dbus.h"

diff --git a/src/login/user-runtime-dir.c b/src/login/user-runtime-dir.c
index 5a16d1684d7aa24edfc43af42496817ba5fcf5c6..7513f6575689bea194619f97f609048188caa47b 100644 (file)
--- a/src/login/user-runtime-dir.c
+++ b/src/login/user-runtime-dir.c
@@ -10,7 +10,7 @@
 #include "dev-setup.h"
 #include "format-util.h"
 #include "fs-util.h"
-#include "label.h"
+#include "label-util.h"
 #include "limits-util.h"
 #include "main-func.h"
 #include "mkdir-label.h"

diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c
index fcf5c710f1d376eac45f525dd203743d120d5223..0a85b5d89a03b2302b8633a334549e1ad2000a51 100644 (file)
--- a/src/nspawn/nspawn-mount.c
+++ b/src/nspawn/nspawn-mount.c
@@ -9,7 +9,7 @@
 #include "fd-util.h"
 #include "format-util.h"
 #include "fs-util.h"
-#include "label.h"
+#include "label-util.h"
 #include "mkdir-label.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"

diff --git a/src/resolve/resolved-resolv-conf.c b/src/resolve/resolved-resolv-conf.c
index 5749aa1dc3e08832e832d66e085a50a552b2779e..52e31d2fd3e474c0bdfa1bd1972ed3077771493f 100644 (file)
--- a/src/resolve/resolved-resolv-conf.c
+++ b/src/resolve/resolved-resolv-conf.c
@@ -10,7 +10,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
-#include "label.h"
+#include "label-util.h"
 #include "ordered-set.h"
 #include "resolved-conf.h"
 #include "resolved-dns-server.h"

diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c
index e0db777c96effafc3e2c40c333ecb0050c0f5852..7dca6ad7d4e6eb49a86384bd603b898771e20492 100644 (file)
--- a/src/shared/dev-setup.c
+++ b/src/shared/dev-setup.c
@@ -6,7 +6,7 @@
 
 #include "alloc-util.h"
 #include "dev-setup.h"
-#include "label.h"
+#include "label-util.h"
 #include "log.h"
 #include "mkdir-label.h"
 #include "nulstr-util.h"

diff --git a/src/shared/hwdb-util.c b/src/shared/hwdb-util.c
index 785611f8c491b6562049fde384ce6b6e13d91adf..a2fbcd7078d3a9ad75a26c4d2ad1583cc4750c44 100644 (file)
--- a/src/shared/hwdb-util.c
+++ b/src/shared/hwdb-util.c
@@ -11,7 +11,7 @@
 #include "fs-util.h"
 #include "hwdb-internal.h"
 #include "hwdb-util.h"
-#include "label.h"
+#include "label-util.h"
 #include "mkdir-label.h"
 #include "nulstr-util.h"
 #include "path-util.h"

diff --git a/src/shared/label.c b/src/shared/label-util.c
similarity index 99%
rename from src/shared/label.c
rename to src/shared/label-util.c
index 66fcc0a31f548f844a0c35095566b82694e8dda1..c0639e3a888c763f78bf23d1c2d4d408c432faac 100644 (file)
--- a/src/shared/label.c
+++ b/src/shared/label-util.c
@@ -6,7 +6,7 @@
 
 #include "btrfs-util.h"
 #include "fs-util.h"
-#include "label.h"
+#include "label-util.h"
 #include "macro.h"
 #include "selinux-util.h"
 #include "smack-util.h"

diff --git a/src/shared/label.h b/src/shared/label-util.h
similarity index 100%
rename from src/shared/label.h
rename to src/shared/label-util.h

diff --git a/src/shared/machine-pool.c b/src/shared/machine-pool.c
index fb0b2f5adcc714c379b6e1c8d34eadfc6045716b..b372de40a37ee70c34fd764c14f2f7964493a328 100644 (file)
--- a/src/shared/machine-pool.c
+++ b/src/shared/machine-pool.c
@@ -3,7 +3,7 @@
 #include <errno.h>
 
 #include "btrfs-util.h"
-#include "label.h"
+#include "label-util.h"
 #include "machine-pool.h"
 #include "missing_magic.h"
 #include "stat-util.h"

diff --git a/src/shared/meson.build b/src/shared/meson.build
index 021ba517f8aba2bf7a0d272c5c6053c8cce9417f..31241bc08d821a4c124006b63469b5810f8c2ffb 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -96,7 +96,7 @@ shared_sources = files(
         'kernel-image.c',
         'keyring-util.c',
         'killall.c',
-        'label.c',
+        'label-util.c',
         'libcrypt-util.c',
         'libfido2-util.c',
         'libmount-util.c',

diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
index 6162a58d9a2aa924b3ae1d3c8846830516e5b906..fd14cd85985e0862218f61b751f269d387f55c12 100644 (file)
--- a/src/shared/mount-setup.c
+++ b/src/shared/mount-setup.c
@@ -17,7 +17,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
-#include "label.h"
+#include "label-util.h"
 #include "log.h"
 #include "macro.h"
 #include "mkdir-label.h"

diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c
index 7a06cc75ae9c567fd92dbc58748a1cc9070b4656..81b681afa7d76c480956159aff66fdf3a75ae2b1 100644 (file)
--- a/src/shared/mount-util.c
+++ b/src/shared/mount-util.c
@@ -22,7 +22,7 @@
 #include "glyph-util.h"
 #include "hashmap.h"
 #include "initrd-util.h"
-#include "label.h"
+#include "label-util.h"
 #include "libmount-util.h"
 #include "missing_mount.h"
 #include "missing_syscall.h"

diff --git a/src/shared/selinux-util.h b/src/shared/selinux-util.h
index e9771a28fe8168a985f7ac5ed38b3d7a741822ae..238550ef52e830c744a70e3e907f2981aee2405a 100644 (file)
--- a/src/shared/selinux-util.h
+++ b/src/shared/selinux-util.h
@@ -7,7 +7,7 @@
 #include <sys/types.h>
 
 #include "macro.h"
-#include "label.h"
+#include "label-util.h"
 
 #if HAVE_SELINUX
 #include <selinux/selinux.h>

diff --git a/src/shared/smack-util.h b/src/shared/smack-util.h
index 17b31c6c2531bf3739d7a5f6b505dc492380c949..953bf9135834b7e96a6b7cdcedd7fa8c211b6322 100644 (file)
--- a/src/shared/smack-util.h
+++ b/src/shared/smack-util.h
@@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include "label.h"
+#include "label-util.h"
 #include "macro.h"
 
 #define SMACK_FLOOR_LABEL "_"

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index e16f26d8d50f71d903dfa5a93473f6f0549a1d66..add3f07cb27775e597621cbaaf2279a538bc7e72 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -41,7 +41,7 @@
 #include "glob-util.h"
 #include "hexdecoct.h"
 #include "io-util.h"
-#include "label.h"
+#include "label-util.h"
 #include "log.h"
 #include "macro.h"
 #include "main-func.h"

diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index e49e959cd8029b82e2589edbe41522490d4e5c77..098e8ed0cc8a0f7c6e39a7009b0db819d01793be 100644 (file)
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -15,7 +15,7 @@
 #include "format-util.h"
 #include "fs-util.h"
 #include "hexdecoct.h"
-#include "label.h"
+#include "label-util.h"
 #include "mkdir-label.h"
 #include "parse-util.h"
 #include "path-util.h"