udev: move udev cleanup functions from udev-util.h to udev.h

diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index 92802a49e803c018d198a09b224cf229a52546bc..a603867b16e3e5863c373455273dc04d65a0ec8e 100644 (file)
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -1,7 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
+#include <errno.h>
 #include <string.h>
 
+#include "alloc-util.h"
 #include "fileio.h"
 #include "log.h"
 #include "string-util.h"

diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h
index e3baf8cdb0299fd2e791bb5d24f86cbe82539277..0df2cf9eb19b63f1e5a53b44fbbe0bdc53aa1f0e 100644 (file)
--- a/src/shared/udev-util.h
+++ b/src/shared/udev-util.h
@@ -1,13 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-#include "udev.h"
-#include "util.h"
-
-DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_event*, udev_event_unref);
-DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_rules*, udev_rules_unref);
-DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_ctrl*, udev_ctrl_unref);
-DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_ctrl_connection*, udev_ctrl_connection_unref);
-DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_ctrl_msg*, udev_ctrl_msg_unref);
-
 int udev_parse_config(void);

diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c
index 68399bdb9eeef9d0ee8283205ed37ef8725cb345..8ffbab14f95486818f2c269d4e87b3cc7225479e 100644 (file)
--- a/src/test/test-libudev.c
+++ b/src/test/test-libudev.c
@@ -5,14 +5,11 @@
 #include <sys/epoll.h>
 #include <unistd.h>
 
-#include "libudev.h"
-
 #include "fd-util.h"
+#include "libudev-private.h"
 #include "log.h"
 #include "stdio-util.h"
 #include "string-util.h"
-#include "udev-util.h"
-#include "util.h"
 
 static void print_device(struct udev_device *device) {
         const char *str;

diff --git a/src/test/test-udev.c b/src/test/test-udev.c
index dd630b97181f121ad40c48059fb6f77e552a93db..93626d9b50c2dfc31adcf5ccbdbdabe756658abb 100644 (file)
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -17,7 +17,6 @@
 #include "selinux-util.h"
 #include "signal-util.h"
 #include "string-util.h"
-#include "udev-util.h"
 #include "udev.h"
 
 static int fake_filesystems(void) {

diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
index 160066673093cd959ce558d59e35ff5417fdff5a..313ad74bf09d52ddb5576aedc4e8bf3544181f62 100644 (file)
--- a/src/udev/scsi_id/scsi_id.c
+++ b/src/udev/scsi_id/scsi_id.c
@@ -19,6 +19,7 @@
 
 #include "libudev.h"
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "libudev-private.h"
 #include "scsi_id.h"

diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c
index 396384f6c84729120132d0a59f258b48698b1733..10155ad338115b9d3725a0cf77c0c54f8174e9cd 100644 (file)
--- a/src/udev/udev-builtin-hwdb.c
+++ b/src/udev/udev-builtin-hwdb.c
@@ -11,7 +11,6 @@
 #include "hwdb-util.h"
 #include "parse-util.h"
 #include "string-util.h"
-#include "udev-util.h"
 #include "udev.h"
 
 static sd_hwdb *hwdb;

diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index 4dddc8677387560c472d8dd4e6f43c306c4e12eb..21e17153061b0dfcdf9d40b77fa5a5b3bff7e65b 100644 (file)
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -102,7 +102,6 @@
 #include "stdio-util.h"
 #include "string-util.h"
 #include "udev.h"
-#include "udev-util.h"
 
 #define ONBOARD_INDEX_MAX (16*1024-1)
 

diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
index 1688cae238ccd0676ca136c787da398249acf8dd..462729f5c892baf21fbbb6747c6bb9e619fd93c1 100644 (file)
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -21,7 +21,6 @@
 #include "string-util.h"
 #include "sysexits.h"
 #include "udev.h"
-#include "udev-util.h"
 
 _printf_(2,3)
 static void path_prepend(char **path, const char *fmt, ...) {

diff --git a/src/udev/udev.h b/src/udev/udev.h
index 778d5c417412b8fed9eb516e9127e1620a6e121f..e79b8ed0d987ab99802bb3ffb35b476b03822e39 100644 (file)
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -188,6 +188,13 @@ int udev_builtin_add_property(struct udev_device *dev, bool test, const char *ke
 int udev_builtin_hwdb_lookup(struct udev_device *dev, const char *prefix, const char *modalias,
                              const char *filter, bool test);
 
+/* Cleanup functions */
+DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_event*, udev_event_unref);
+DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_rules*, udev_rules_unref);
+DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_ctrl*, udev_ctrl_unref);
+DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_ctrl_connection*, udev_ctrl_connection_unref);
+DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_ctrl_msg*, udev_ctrl_msg_unref);
+
 /* udevadm commands */
 struct udevadm_cmd {
         const char *name;

diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c
index 7f89d4f536c8c1057fbe439d564f283cd1c8f658..fb8ebdd485e4b2bc992eb5fc01b7185f9b79c28e 100644 (file)
--- a/src/udev/udevadm-control.c
+++ b/src/udev/udevadm-control.c
@@ -21,7 +21,6 @@
 
 #include "process-util.h"
 #include "time-util.h"
-#include "udev-util.h"
 #include "udev.h"
 #include "udevadm-util.h"
 

diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c
index e0c110135a4c045b8dbb065ad52c082c4ac2943d..a7530e02e7e62fc50defeba7428c0761879f557f 100644 (file)
--- a/src/udev/udevadm-info.c
+++ b/src/udev/udevadm-info.c
@@ -13,7 +13,6 @@
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "string-util.h"
-#include "udev-util.h"
 #include "udev.h"
 #include "udevadm-util.h"
 

diff --git a/src/udev/udevadm-monitor.c b/src/udev/udevadm-monitor.c
index d44b1fe521b7fd8a959432243cc57954d259cbd7..aa6600f6a5671ac40bf490399679ce391945656e 100644 (file)
--- a/src/udev/udevadm-monitor.c
+++ b/src/udev/udevadm-monitor.c
@@ -12,7 +12,6 @@
 
 #include "fd-util.h"
 #include "format-util.h"
-#include "udev-util.h"
 #include "udev.h"
 #include "udevadm-util.h"
 

diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c
index 73bb2124fc78ba4a895c435ddae2c5be5ab38cc4..cad462e281765037cab8b28ff199b54b4da90a38 100644 (file)
--- a/src/udev/udevadm-test.c
+++ b/src/udev/udevadm-test.c
@@ -13,7 +13,6 @@
 #include <unistd.h>
 
 #include "string-util.h"
-#include "udev-util.h"
 #include "udev.h"
 #include "udevadm-util.h"
 

diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c
index 21c43af18a3e85db42c4d19c18e6b0f78e047eda..5d90911894c2544fe35880470e7bdf649b2df719 100644 (file)
--- a/src/udev/udevadm-trigger.c
+++ b/src/udev/udevadm-trigger.c
@@ -11,7 +11,6 @@
 #include "fd-util.h"
 #include "set.h"
 #include "string-util.h"
-#include "udev-util.h"
 #include "udev.h"
 #include "udevadm-util.h"
 #include "util.h"