Use list_replace() instead of list_transfer()
authorEric Biggers <ebiggers3@gmail.com>
Thu, 2 Jul 2015 23:44:48 +0000 (18:44 -0500)
committerEric Biggers <ebiggers3@gmail.com>
Thu, 2 Jul 2015 23:44:48 +0000 (18:44 -0500)
include/wimlib/list.h
src/split.c

index f59e113c994c52d217f3c9807af4b20c474446ec..d556a56c6a142ddfaf2a732db3e4a4cb2912913b 100644 (file)
@@ -140,24 +140,6 @@ list_splice(const struct list_head *list, struct list_head *head)
                __list_splice(list, head, head->next);
 }
 
-/* Move the entire list @old to the list @new, overwriting it. */
-static inline void
-list_transfer(struct list_head *old, struct list_head *new)
-{
-       struct list_head *prev, *next;
-
-       if (list_empty(old)) {
-               INIT_LIST_HEAD(new);
-       } else {
-               prev = old->prev;
-               next = old->next;
-               new->next = next;
-               new->prev = prev;
-               prev->next = new;
-               next->prev = new;
-       }
-}
-
 /**
  * list_move - delete from one list and add as another's head
  * @list: the entry to move
index 3f4a7d0a87a170805de89b7cf2072962a6396d67..6124a67da81c09317ca5c2ba993c05cb4f6e3067 100644 (file)
@@ -44,7 +44,7 @@ struct swm_part_info {
 static void
 copy_part_info(struct swm_part_info *dst, struct swm_part_info *src)
 {
-       list_transfer(&src->blob_list, &dst->blob_list);
+       list_replace(&src->blob_list, &dst->blob_list);
        dst->size = src->size;
 }