X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibudev%2Flibudev-list.c;h=c6e5a61fe9bf56facc9232f225fab44080db48a8;hb=fcf90586a2b26c445d6a35313990096c8562ecee;hp=1578aecaae13379e1ef9c7500e2c324c66f18f03;hpb=88a6477ef32ac4c59111f7340525714a6e02e503;p=elogind.git

diff --git a/src/libudev/libudev-list.c b/src/libudev/libudev-list.c
index 1578aecaa..c6e5a61fe 100644
--- a/src/libudev/libudev-list.c
+++ b/src/libudev/libudev-list.c
@@ -95,14 +95,14 @@ static inline struct udev_list_entry *list_node_to_entry(struct udev_list_node *
 
 void udev_list_init(struct udev *udev, struct udev_list *list, bool unique)
 {
-        memset(list, 0x00, sizeof(struct udev_list));
+        memzero(list, sizeof(struct udev_list));
         list->udev = udev;
         list->unique = unique;
         udev_list_node_init(&list->node);
 }
 
 /* insert entry into a list as the last element  */
-void udev_list_entry_append(struct udev_list_entry *new, struct udev_list *list)
+static void udev_list_entry_append(struct udev_list_entry *new, struct udev_list *list)
 {
         /* inserting before the list head make the node the last node in the list */
         udev_list_node_insert_between(&new->node, list->node.prev, &list->node);
@@ -110,7 +110,7 @@ void udev_list_entry_append(struct udev_list_entry *new, struct udev_list *list)
 }
 
 /* insert entry into a list, before a given existing entry */
-void udev_list_entry_insert_before(struct udev_list_entry *new, struct udev_list_entry *entry)
+static 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;
@@ -185,18 +185,20 @@ struct udev_list_entry *udev_list_entry_add(struct udev_list *list, const char *
         if (list->unique) {
                 /* allocate or enlarge sorted array if needed */
                 if (list->entries_cur >= list->entries_max) {
+                        struct udev_list_entry **entries;
                         unsigned int add;
 
                         add = list->entries_max;
                         if (add < 1)
                                 add = 64;
-                        list->entries = realloc(list->entries, (list->entries_max + add) * sizeof(struct udev_list_entry *));
-                        if (list->entries == NULL) {
+                        entries = realloc(list->entries, (list->entries_max + add) * sizeof(struct udev_list_entry *));
+                        if (entries == NULL) {
                                 free(entry->name);
                                 free(entry->value);
                                 free(entry);
                                 return NULL;
                         }
+                        list->entries = entries;
                         list->entries_max += add;
                 }