X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Flist.h;h=2991f46a1fed17d0ec36cbf5e7cc750deaee17e4;hp=ce2dad2c495d55910a935d4c27b0abba2cb5949a;hb=78da4e026457e507e0d4fc930dcfe2855075dc11;hpb=5604fa76ebf1b5589425aa3864585975624b822d

diff --git a/src/list.h b/src/list.h
index ce2dad2c..2991f46a 100644
--- a/src/list.h
+++ b/src/list.h
@@ -119,6 +119,85 @@ static inline int list_empty(const struct list_head *head)
 	return head->next == head;
 }
 
+static inline void __list_splice(const struct list_head *list,
+				 struct list_head *prev,
+				 struct list_head *next)
+{
+	struct list_head *first = list->next;
+	struct list_head *last = list->prev;
+
+	first->prev = prev;
+	prev->next = first;
+
+	last->next = next;
+	next->prev = last;
+}
+
+/**
+ * list_splice - join two lists, this is designed for stacks
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ */
+static inline void list_splice(const struct list_head *list,
+				struct list_head *head)
+{
+	if (!list_empty(list))
+		__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
+ * @head: the head that will precede our entry
+ */
+static inline void list_move(struct list_head *list, struct list_head *head)
+{
+	list_del(list);
+	list_add(list, head);
+}
+
+/**
+ * list_move_tail - delete from one list and add as another's tail
+ * @list: the entry to move
+ * @head: the head that will follow our entry
+ */
+static inline void list_move_tail(struct list_head *list,
+				  struct list_head *head)
+{
+	list_del(list);
+	list_add_tail(list, head);
+}
+
+/**
+ * list_splice_tail - join two lists, each list being a queue
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ */
+static inline void list_splice_tail(struct list_head *list,
+				struct list_head *head)
+{
+	if (!list_empty(list))
+		__list_splice(list, head->prev, head);
+}
+
 /**
  * list_entry - get the struct for this entry
  * @ptr:	the &struct list_head pointer.
@@ -195,16 +274,6 @@ static inline void hlist_del(struct hlist_node *n)
 		next->pprev = pprev;
 }
 
-static inline void hlist_safe_del(struct hlist_node *n)
-{
-	struct hlist_node *next = n->next;
-	struct hlist_node **pprev = n->pprev;
-	if (pprev)
-		*pprev = next;
-	if (next)
-		next->pprev = pprev;
-}
-
 static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
 {
 	struct hlist_node *first = h->first;