From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 22 Aug 2018 07:25:17 +0000 (+0900)
Subject: udev: move udev cleanup functions from udev-util.h to udev.h
X-Git-Tag: v240~812^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=152d0efa2bd70ebbaa48bde734b1ba5770a07412;p=thirdparty%2Fsystemd.git

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 92802a49e80..a603867b16e 100644
--- 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 e3baf8cdb02..0df2cf9eb19 100644
--- 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 68399bdb9ee..8ffbab14f95 100644
--- 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 dd630b97181..93626d9b50c 100644
--- 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 16006667309..313ad74bf09 100644
--- 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 396384f6c84..10155ad3381 100644
--- 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 4dddc867738..21e17153061 100644
--- 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 1688cae238c..462729f5c89 100644
--- 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 778d5c41741..e79b8ed0d98 100644
--- 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 7f89d4f536c..fb8ebdd485e 100644
--- 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 e0c110135a4..a7530e02e7e 100644
--- 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 d44b1fe521b..aa6600f6a56 100644
--- 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 73bb2124fc7..cad462e2817 100644
--- 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 21c43af18a3..5d90911894c 100644
--- 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"