chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move some info() to dbg()
[elogind.git]
/
udev
/
lib
/
libudev-list.c
diff --git
a/udev/lib/libudev-list.c
b/udev/lib/libudev-list.c
index 918277cb649b584863abeb5b7d1c671391756a81..e681e23e84c1506f62fcfcc070510c3683410e8d 100644
(file)
--- a/
udev/lib/libudev-list.c
+++ b/
udev/lib/libudev-list.c
@@
-43,14
+43,14
@@
void udev_list_init(struct udev_list_node *list)
list->prev = list;
}
list->prev = list;
}
-
static int
list_is_empty(struct udev_list_node *list)
+
int udev_
list_is_empty(struct udev_list_node *list)
{
return list->next == list;
}
{
return list->next == list;
}
-static void list_node_insert_between(struct udev_list_node *new,
- struct udev_list_node *prev,
- struct udev_list_node *next)
+static void
udev_
list_node_insert_between(struct udev_list_node *new,
+
struct udev_list_node *prev,
+
struct udev_list_node *next)
{
next->prev = new;
new->next = next;
{
next->prev = new;
new->next = next;
@@
-58,7
+58,12
@@
static void list_node_insert_between(struct udev_list_node *new,
prev->next = new;
}
prev->next = new;
}
-static void list_node_remove(struct udev_list_node *entry)
+void udev_list_node_append(struct udev_list_node *new, struct udev_list_node *list)
+{
+ udev_list_node_insert_between(new, list->prev, list);
+}
+
+void udev_list_node_remove(struct udev_list_node *entry)
{
struct udev_list_node *prev = entry->prev;
struct udev_list_node *next = entry->next;
{
struct udev_list_node *prev = entry->prev;
struct udev_list_node *next = entry->next;
@@
-84,14
+89,14
@@
static struct udev_list_entry *list_node_to_entry(struct udev_list_node *node)
static void 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 */
static void 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 */
- list_node_insert_between(&new->node, list->prev, list);
+
udev_
list_node_insert_between(&new->node, list->prev, list);
new->list = list;
}
/* 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)
{
new->list = list;
}
/* 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)
{
- list_node_insert_between(&new->node, entry->node.prev, &entry->node);
+
udev_
list_node_insert_between(&new->node, entry->node.prev, &entry->node);
new->list = entry->list;
}
new->list = entry->list;
}
@@
-105,17
+110,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) {
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;
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;
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;
}
}
return entry_loop;
}
}
@@
-148,19
+153,19
@@
struct udev_list_entry *udev_list_entry_add(struct udev *udev, struct udev_list_
list_entry_insert_before(entry_new, entry_loop);
else
list_entry_append(entry_new, list);
list_entry_insert_before(entry_new, entry_loop);
else
list_entry_append(entry_new, list);
-
info
(udev, "'%s=%s' added\n", entry_new->name, entry_new->value);
+
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)
{
return entry_new;
}
void udev_list_entry_remove(struct udev_list_entry *entry)
{
- list_node_remove(&entry->node);
+
udev_
list_node_remove(&entry->node);
free(entry->name);
free(entry->value);
free(entry);
}
free(entry->name);
free(entry->value);
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;
{
struct udev_list_entry *entry_loop;
struct udev_list_entry *entry_tmp;
@@
-171,20
+176,20
@@
void udev_list_cleanup(struct udev *udev, struct udev_list_node *list)
void udev_list_entry_move_to_end(struct udev_list_entry *list_entry)
{
void udev_list_entry_move_to_end(struct udev_list_entry *list_entry)
{
- list_node_remove(&list_entry->node);
- list_node_insert_between(&list_entry->node, list_entry->list->prev, list_entry->list);
+
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_
to_list(struct udev_list_entry *list_entry, struct udev_list_node *list
)
+void udev_list_entry_move_
before(struct udev_list_entry *list_entry, struct udev_list_entry *entry
)
{
{
- list_node_remove(&list_entry->node);
-
list_node_insert_between(&list_entry->node, list->prev, list
);
- list_entry->list = list;
+
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;
}
struct udev_list_entry *udev_list_get_entry(struct udev_list_node *list)
{
}
struct udev_list_entry *udev_list_get_entry(struct udev_list_node *list)
{
- if (list_is_empty(list))
+ if (
udev_
list_is_empty(list))
return NULL;
return list_node_to_entry(list->next);
}
return NULL;
return list_node_to_entry(list->next);
}