libudev: monitor - export filter_update()

[elogind.git] / udev / lib / libudev-list.c

diff --git a/udev/lib/libudev-list.c b/udev/lib/libudev-list.c
index 606e3d5d630833c5b9e20b2e91ded0fcdcde5443..0c13b6d9277ae064a138e71305aa40e448ea56d4 100644 (file)
--- a/udev/lib/libudev-list.c
+++ b/udev/lib/libudev-list.c
@@ -3,18 +3,10 @@
  *
  * Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  */
 
 #include <stdio.h>
@@ -28,8 +20,8 @@
 #include "libudev-private.h"
 
 struct udev_list_entry {
-       struct udev *udev;
        struct udev_list_node node;
+       struct udev *udev;
        struct udev_list_node *list;
        char *name;
        char *value;
@@ -86,15 +78,22 @@ static struct udev_list_entry *list_node_to_entry(struct udev_list_node *node)
 }
 
 /* insert entry into a list as the last element  */
-static void list_entry_append(struct udev_list_entry *new, struct udev_list_node *list)
+void udev_list_entry_append(struct udev_list_entry *new, struct udev_list_node *list)
 {
        /* inserting before the list head make the node the last node in the list */
        udev_list_node_insert_between(&new->node, list->prev, list);
        new->list = list;
 }
 
+/* remove entry from a list */
+void udev_list_entry_remove(struct udev_list_entry *entry)
+{
+       udev_list_node_remove(&entry->node);
+       entry->list = NULL;
+}
+
 /* insert entry into a list, before a given existing entry */
-static void list_entry_insert_before(struct udev_list_entry *new, struct udev_list_entry *entry)
+void udev_list_entry_insert_before(struct udev_list_entry *new, struct udev_list_entry *entry)
 {
        udev_list_node_insert_between(&new->node, entry->node.prev, &entry->node);
        new->list = entry->list;
@@ -110,17 +109,17 @@ struct udev_list_entry *udev_list_entry_add(struct udev *udev, struct udev_list_
        if (unique)
                udev_list_entry_foreach(entry_loop, udev_list_get_entry(list)) {
                        if (strcmp(entry_loop->name, name) == 0) {
-                               info(udev, "'%s' is already in the list\n", name);
+                               dbg(udev, "'%s' is already in the list\n", name);
                                free(entry_loop->value);
                                if (value == NULL) {
                                        entry_loop->value = NULL;
-                                       info(udev, "'%s' value unset\n", name);
+                                       dbg(udev, "'%s' value unset\n", name);
                                        return entry_loop;
                                }
                                entry_loop->value = strdup(value);
                                if (entry_loop->value == NULL)
                                        return NULL;
-                               info(udev, "'%s' value replaced with '%s'\n", name, value);
+                               dbg(udev, "'%s' value replaced with '%s'\n", name, value);
                                return entry_loop;
                        }
                }
@@ -150,14 +149,14 @@ struct udev_list_entry *udev_list_entry_add(struct udev *udev, struct udev_list_
                }
        }
        if (entry_loop != NULL)
-               list_entry_insert_before(entry_new, entry_loop);
+               udev_list_entry_insert_before(entry_new, entry_loop);
        else
-               list_entry_append(entry_new, list);
+               udev_list_entry_append(entry_new, list);
        dbg(udev, "'%s=%s' added\n", entry_new->name, entry_new->value);
        return entry_new;
 }
 
-void udev_list_entry_remove(struct udev_list_entry *entry)
+void udev_list_entry_delete(struct udev_list_entry *entry)
 {
        udev_list_node_remove(&entry->node);
        free(entry->name);
@@ -165,26 +164,13 @@ void udev_list_entry_remove(struct udev_list_entry *entry)
        free(entry);
 }
 
-void udev_list_cleanup(struct udev *udev, struct udev_list_node *list)
+void udev_list_cleanup_entries(struct udev *udev, struct udev_list_node *list)
 {
        struct udev_list_entry *entry_loop;
        struct udev_list_entry *entry_tmp;
 
        udev_list_entry_foreach_safe(entry_loop, entry_tmp, udev_list_get_entry(list))
-               udev_list_entry_remove(entry_loop);
-}
-
-void udev_list_entry_move_to_end(struct udev_list_entry *list_entry)
-{
-       udev_list_node_remove(&list_entry->node);
-       udev_list_node_insert_between(&list_entry->node, list_entry->list->prev, list_entry->list);
-}
-
-void udev_list_entry_move_before(struct udev_list_entry *list_entry, struct udev_list_entry *entry)
-{
-       udev_list_node_remove(&list_entry->node);
-       udev_list_node_insert_between(&list_entry->node, entry->node.prev, &entry->node);
-       list_entry->list = entry->list;
+               udev_list_entry_delete(entry_loop);
 }
 
 struct udev_list_entry *udev_list_get_entry(struct udev_list_node *list)