udev: move global property handling from libudev to udevd

3 files changed, 1 insertions, 31 deletions

diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
index 506798f22e..37e75d280f 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -642,7 +642,6 @@ void udev_device_set_info_loaded(struct udev_device *device)
 struct udev_device *udev_device_new(struct udev *udev)
 {
         struct udev_device *udev_device;
-        struct udev_list_entry *list_entry;
 
         if (udev == NULL) {
                 errno = EINVAL;
@@ -662,11 +661,7 @@ struct udev_device *udev_device_new(struct udev *udev)
         udev_list_init(udev, &udev_device->sysattr_list, false);
         udev_list_init(udev, &udev_device->tags_list, true);
         udev_device->watch_handle = -1;
-        /* copy global properties */
-        udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
-                udev_device_add_property(udev_device,
-                                         udev_list_entry_get_name(list_entry),
-                                         udev_list_entry_get_value(list_entry));
+
         return udev_device;
 }
 
diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
index 2bad13997f..64f132f91d 100644
--- a/src/libudev/libudev-private.h
+++ b/src/libudev/libudev-private.h
@@ -34,12 +34,7 @@
 #define WRITE_END 1
 
 /* libudev.c */
-void udev_log(struct udev *udev,
-              int priority, const char *file, int line, const char *fn,
-              const char *format, ...) _printf_(6, 7);
 int udev_get_rules_path(struct udev *udev, char **path[], usec_t *ts_usec[]);
-struct udev_list_entry *udev_add_property(struct udev *udev, const char *key, const char *value);
-struct udev_list_entry *udev_get_properties_list_entry(struct udev *udev);
 
 /* libudev-device.c */
 struct udev_device *udev_device_new(struct udev *udev);
diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c
index 64fe7c42fd..c237db5e96 100644
--- a/src/libudev/libudev.c
+++ b/src/libudev/libudev.c
@@ -50,7 +50,6 @@ struct udev {
                        int priority, const char *file, int line, const char *fn,
                        const char *format, va_list args);
         void *userdata;
-        struct udev_list properties_list;
 };
 
 /**
@@ -100,7 +99,6 @@ _public_ struct udev *udev_new(void) {
         if (udev == NULL)
                 return NULL;
         udev->refcount = 1;
-        udev_list_init(udev, &udev->properties_list, true);
 
         f = fopen("/etc/udev/udev.conf", "re");
         if (f != NULL) {
@@ -211,7 +209,6 @@ _public_ struct udev *udev_unref(struct udev *udev) {
         udev->refcount--;
         if (udev->refcount > 0)
                 return udev;
-        udev_list_cleanup(&udev->properties_list);
         free(udev);
         return NULL;
 }
@@ -253,20 +250,3 @@ _public_ int udev_get_log_priority(struct udev *udev) {
 _public_ void udev_set_log_priority(struct udev *udev, int priority) {
         log_set_max_level(priority);
 }
-
-struct udev_list_entry *udev_add_property(struct udev *udev, const char *key, const char *value) {
-        if (value == NULL) {
-                struct udev_list_entry *list_entry;
-
-                list_entry = udev_get_properties_list_entry(udev);
-                list_entry = udev_list_entry_get_by_name(list_entry, key);
-                if (list_entry != NULL)
-                        udev_list_entry_delete(list_entry);
-                return NULL;
-        }
-        return udev_list_entry_add(&udev->properties_list, key, value);
-}
-
-struct udev_list_entry *udev_get_properties_list_entry(struct udev *udev) {
-        return udev_list_get_entry(&udev->properties_list);
-}