udev: move global property handling from libudev to udevd

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

3 files changed, 1 insertions, 10 deletions

diff --git a/src/udev/udev-builtin-kmod.c b/src/udev/udev-builtin-kmod.c
index b83fd523d9..5c50f7856d 100644
--- a/src/udev/udev-builtin-kmod.c
+++ b/src/udev/udev-builtin-kmod.c
@@ -88,7 +88,7 @@ static int load_module(struct udev *udev, const char *alias) {
 _printf_(6,0)
 static void udev_kmod_log(void *data, int priority, const char *file, int line,
                           const char *fn, const char *format, va_list args) {
-        udev_main_log(data, priority, file, line, fn, format, args);
+        log_metav(priority, file, line, fn, format, args);
 }
 
 static int builtin_kmod(struct udev_device *dev, int argc, char *argv[], bool test) {
diff --git a/src/udev/udev.h b/src/udev/udev.h
index 5a1f5488cb..86f4b98911 100644
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -193,11 +193,6 @@ 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);
 
-/* udev logging */
-void udev_main_log(struct udev *udev, int priority,
-                   const char *file, int line, const char *fn,
-                   const char *format, va_list args) _printf_(6, 0);
-
 /* udevadm commands */
 struct udevadm_cmd {
         const char *name;
diff --git a/test/test-udev.c b/test/test-udev.c
index d07962c285..92ea765f2f 100644
--- a/test/test-udev.c
+++ b/test/test-udev.c
@@ -46,10 +46,6 @@ static inline int unshare (int x) { return syscall(SYS_unshare, x); }
 #include <linux/sched.h>
 #endif
 
-void udev_main_log(struct udev *udev, int priority,
-                   const char *file, int line, const char *fn,
-                   const char *format, va_list args) {}
-
 static int fake_filesystems(void) {
         static const struct fakefs {
                 const char *src;