Merge pull request #25291 from keszybz/util-cleanup

Split/rename util.c+h and def.h

11 files changed, 2 insertions, 11 deletions

diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index e408725b08..1fbfc58c0d 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -11,8 +11,8 @@
 #include "arphrd-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
+#include "constants.h"
 #include "creds-util.h"
-#include "def.h"
 #include "device-private.h"
 #include "device-util.h"
 #include "ethtool-util.h"
diff --git a/src/udev/test-udev-event.c b/src/udev/test-udev-event.c
index b6b2c91b2e..42f435916b 100644
--- a/src/udev/test-udev-event.c
+++ b/src/udev/test-udev-event.c
@@ -5,7 +5,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "udev-event.h"
-#include "util.h"
 
 #define BUF_SIZE 1024
 
diff --git a/src/udev/udev-builtin-btrfs.c b/src/udev/udev-builtin-btrfs.c
index 8cd627807f..faaafb23f6 100644
--- a/src/udev/udev-builtin-btrfs.c
+++ b/src/udev/udev-builtin-btrfs.c
@@ -11,7 +11,6 @@
 #include "string-util.h"
 #include "strxcpyx.h"
 #include "udev-builtin.h"
-#include "util.h"
 
 static int builtin_btrfs(sd_device *dev, sd_netlink **rtnl, int argc, char *argv[], bool test) {
         struct btrfs_ioctl_vol_args args = {};
diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
index 0742120248..465913ce31 100644
--- a/src/udev/udev-builtin-input_id.c
+++ b/src/udev/udev-builtin-input_id.c
@@ -19,7 +19,6 @@
 #include "stdio-util.h"
 #include "string-util.h"
 #include "udev-builtin.h"
-#include "util.h"
 
 /* we must use this kernel-compatible implementation */
 #define BITS_PER_LONG (sizeof(unsigned long) * 8)
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index c8b773611f..625c4faad8 100644
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -18,7 +18,6 @@
 #include "socket-util.h"
 #include "strxcpyx.h"
 #include "udev-ctrl.h"
-#include "util.h"
 
 /* wire protocol magic must match */
 #define UDEV_CTRL_MAGIC                                0xdead1dea
diff --git a/src/udev/udev-event.h b/src/udev/udev-event.h
index 6d823331aa..c54c7891b6 100644
--- a/src/udev/udev-event.h
+++ b/src/udev/udev-event.h
@@ -12,7 +12,6 @@
 #include "macro.h"
 #include "udev-rules.h"
 #include "udev-util.h"
-#include "util.h"
 
 #define READ_END  0
 #define WRITE_END 1
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index f44a174d1f..5f837f4c31 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -6,7 +6,7 @@
 #include "architecture.h"
 #include "conf-files.h"
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "device-private.h"
 #include "device-util.h"
 #include "dirent-util.h"
diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c
index 06c61e5c07..8dc3a8d955 100644
--- a/src/udev/udevadm-control.c
+++ b/src/udev/udevadm-control.c
@@ -25,7 +25,6 @@
 #include "time-util.h"
 #include "udevadm.h"
 #include "udev-ctrl.h"
-#include "util.h"
 #include "virt.h"
 
 static int help(void) {
diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index 972cda129d..a4468cf24f 100644
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -4,7 +4,6 @@
 
 #include "hwdb-util.h"
 #include "udevadm.h"
-#include "util.h"
 
 static const char *arg_test = NULL;
 static const char *arg_root = NULL;
diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
index cd3786b416..b742c1a287 100644
--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
@@ -14,7 +14,6 @@
 #include "udev-util.h"
 #include "udevadm.h"
 #include "udevd.h"
-#include "util.h"
 #include "verbs.h"
 
 static int help(void) {
diff --git a/src/udev/v4l_id/v4l_id.c b/src/udev/v4l_id/v4l_id.c
index c2312c7909..13b4839989 100644
--- a/src/udev/v4l_id/v4l_id.c
+++ b/src/udev/v4l_id/v4l_id.c
@@ -27,7 +27,6 @@
 #include <linux/videodev2.h>
 
 #include "fd-util.h"
-#include "util.h"
 
 int main(int argc, char *argv[]) {
         static const struct option options[] = {