X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibudev%2Flibudev.c;h=8785f22071f2b5203e5b22578088830dbab6a305;hp=64fe7c42fd1f317ac4430aac514f5d88f1f70388;hb=ff49bc3212cb07d850dcfd59940539773a0be26f;hpb=25e773eeb4f853804e1bf0dbd9a184f23e9b2a97

diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c
index 64fe7c42f..8785f2207 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) {
@@ -126,7 +124,7 @@ _public_ struct udev *udev_new(void) {
                         /* split key/value */
                         val = strchr(key, '=');
                         if (val == NULL) {
-                                log_debug("/etc/udev/udev.conf:%u: missing assignment,  skipping line.\n", line_nr);
+                                log_debug("/etc/udev/udev.conf:%u: missing assignment,  skipping line.", line_nr);
                                 continue;
                         }
                         val[0] = '\0';
@@ -158,7 +156,7 @@ _public_ struct udev *udev_new(void) {
                         /* unquote */
                         if (val[0] == '"' || val[0] == '\'') {
                                 if (val[len-1] != val[0]) {
-                                        log_debug("/etc/udev/udev.conf:%u: inconsistent quoting, skipping line.\n", line_nr);
+                                        log_debug("/etc/udev/udev.conf:%u: inconsistent quoting, skipping line.", line_nr);
                                         continue;
                                 }
                                 val[len-1] = '\0';
@@ -170,7 +168,7 @@ _public_ struct udev *udev_new(void) {
 
                                 prio = util_log_priority(val);
                                 if (prio < 0)
-                                        log_debug("/etc/udev/udev.conf:%u: invalid log level '%s', ignoring.\n", line_nr, val);
+                                        log_debug("/etc/udev/udev.conf:%u: invalid log level '%s', ignoring.", line_nr, val);
                                 else
                                         log_set_max_level(prio);
                                 continue;
@@ -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);
-}