X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Flist%2Flist.h;h=5b4f81c965725d473f7cfc6df52812c21fc7cfc4;hp=e1f07a0e043ae7f460d2650e2acdf39d468ab5aa;hb=a04a5f7472bd8146936864702084e533d474eea4;hpb=0c492447b997ad50c289314a7ba41cca6bcc1c3c

diff --git a/ccan/list/list.h b/ccan/list/list.h
index e1f07a0e..5b4f81c9 100644
--- a/ccan/list/list.h
+++ b/ccan/list/list.h
@@ -39,7 +39,7 @@ struct list_head
 };
 
 /**
- * list_check - check a list for consistency
+ * list_check - check head of a list for consistency
  * @h: the list_head
  * @abortstr: the location to print on aborting, or NULL.
  *
@@ -51,30 +51,69 @@ struct list_head
  * Returns the list head if the list is consistent, NULL if not (it
  * can never return NULL if @abortstr is set).
  *
+ * See also: list_check_node()
+ *
  * Example:
  *	static void dump_parent(struct parent *p)
  *	{
  *		struct child *c;
  *
- *		printf("%s (%u children):\n", p->name, parent->num_children);
+ *		printf("%s (%u children):\n", p->name, p->num_children);
  *		list_check(&p->children, "bad child list");
  *		list_for_each(&p->children, c, list)
  *			printf(" -> %s\n", c->name);
  *	}
  */
-struct list_head *list_check(struct list_head *h, const char *abortstr);
+struct list_head *list_check(const struct list_head *h, const char *abortstr);
+
+/**
+ * list_check_node - check node of a list for consistency
+ * @n: the list_node
+ * @abortstr: the location to print on aborting, or NULL.
+ *
+ * Check consistency of the list node is in (it must be in one).
+ *
+ * See also: list_check()
+ *
+ * Example:
+ *	static void dump_child(const struct child *c)
+ *	{
+ *		list_check_node(&c->list, "bad child list");
+ *		printf("%s\n", c->name);
+ *	}
+ */
+struct list_node *list_check_node(const struct list_node *n,
+				  const char *abortstr);
 
 #ifdef CCAN_LIST_DEBUG
-#define debug_list(h) list_check((h), __func__)
+#define list_debug(h) list_check((h), __func__)
+#define list_debug_node(n) list_check_node((n), __func__)
 #else
-#define debug_list(h) (h)
+#define list_debug(h) (h)
+#define list_debug_node(n) (n)
 #endif
 
+/**
+ * LIST_HEAD - define and initalize an empty list_head
+ * @name: the name of the list.
+ *
+ * The LIST_HEAD macro defines a list_head and initializes it to an empty
+ * list.  It can be prepended by "static" to define a static list_head.
+ *
+ * Example:
+ *	static LIST_HEAD(my_global_list);
+ */
+#define LIST_HEAD(name) \
+	struct list_head name = { { &name.n, &name.n } }
+
 /**
  * list_head_init - initialize a list_head
  * @h: the list_head to set to the empty list
  *
  * Example:
+ *	...
+ *	struct parent *parent = malloc(sizeof(*parent));
+ *
  *	list_head_init(&parent->children);
  *	parent->num_children = 0;
  */
@@ -83,23 +122,6 @@ static inline void list_head_init(struct list_head *h)
 	h->n.next = h->n.prev = &h->n;
 }
 
-/**
- * LIST_HEAD - define and initalized empty list_head
- * @name: the name of the list.
- *
- * The LIST_HEAD macro defines a list_head and initializes it to an empty
- * list.  It can be prepended by "static" to define a static list_head.
- *
- * Example:
- *	// Header:
- *	extern struct list_head my_list;
- *
- *	// C file:
- *	LIST_HEAD(my_list);
- */
-#define LIST_HEAD(name) \
-	struct list_head name = { { &name.n, &name.n } }
-
 /**
  * list_add - add an entry at the start of a linked list.
  * @h: the list_head to add the node to
@@ -107,6 +129,9 @@ static inline void list_head_init(struct list_head *h)
  *
  * The list_node does not need to be initialized; it will be overwritten.
  * Example:
+ *	struct child *child = malloc(sizeof(*child));
+ *
+ *	child->name = "marvin";
  *	list_add(&parent->children, &child->list);
  *	parent->num_children++;
  */
@@ -116,7 +141,7 @@ static inline void list_add(struct list_head *h, struct list_node *n)
 	n->prev = &h->n;
 	h->n.next->prev = n;
 	h->n.next = n;
-	(void)debug_list(h);
+	(void)list_debug(h);
 }
 
 /**
@@ -135,7 +160,7 @@ static inline void list_add_tail(struct list_head *h, struct list_node *n)
 	n->prev = h->n.prev;
 	h->n.prev->next = n;
 	h->n.prev = n;
-	(void)debug_list(h);
+	(void)list_debug(h);
 }
 
 /**
@@ -148,9 +173,9 @@ static inline void list_add_tail(struct list_head *h, struct list_node *n)
  */
 static inline void list_del(struct list_node *n)
 {
+	(void)list_debug_node(n);
 	n->next->prev = n->prev;
 	n->prev->next = n->next;
-	(void)debug_list(n->next);
 #ifdef CCAN_LIST_DEBUG
 	/* Catch use-after-del. */
 	n->next = n->prev = NULL;
@@ -166,9 +191,9 @@ static inline void list_del(struct list_node *n)
  * Example:
  *	assert(list_empty(&parent->children) == (parent->num_children == 0));
  */
-static inline bool list_empty(struct list_head *h)
+static inline bool list_empty(const struct list_head *h)
 {
-	(void)debug_list(h);
+	(void)list_debug(h);
 	return h->n.next == &h->n;
 }
 
@@ -179,9 +204,11 @@ static inline bool list_empty(struct list_head *h)
  * @member: the list_node member of the type
  *
  * Example:
- *	struct child *c;
  *	// First list entry is children.next; convert back to child.
- *	c = list_entry(parent->children.next, struct child, list);
+ *	child = list_entry(parent->children.n.next, struct child, list);
+ *
+ * See Also:
+ *	list_top(), list_for_each()
  */
 #define list_entry(n, type, member) container_of(n, type, member)
 
@@ -225,12 +252,11 @@ static inline bool list_empty(struct list_head *h)
  * a for loop, so you can break and continue as normal.
  *
  * Example:
- *	struct child *c;
- *	list_for_each(&parent->children, c, list)
- *		printf("Name: %s\n", c->name);
+ *	list_for_each(&parent->children, child, list)
+ *		printf("Name: %s\n", child->name);
  */
 #define list_for_each(h, i, member)					\
-	for (i = container_of_var(debug_list(h)->n.next, i, member);	\
+	for (i = container_of_var(list_debug(h)->n.next, i, member);	\
 	     &i->member != &(h)->n;					\
 	     i = container_of_var(i->member.next, i, member))
 
@@ -246,14 +272,14 @@ static inline bool list_empty(struct list_head *h)
  * @nxt is used to hold the next element, so you can delete @i from the list.
  *
  * Example:
- *	struct child *c, *n;
- *	list_for_each_safe(&parent->children, c, n, list) {
- *		list_del(&c->list);
+ *	struct child *next;
+ *	list_for_each_safe(&parent->children, child, next, list) {
+ *		list_del(&child->list);
  *		parent->num_children--;
  *	}
  */
 #define list_for_each_safe(h, i, nxt, member)				\
-	for (i = container_of_var(debug_list(h)->n.next, i, member),	\
+	for (i = container_of_var(list_debug(h)->n.next, i, member),	\
 		nxt = container_of_var(i->member.next, i, member);	\
 	     &i->member != &(h)->n;					\
 	     i = nxt, nxt = container_of_var(i->member.next, i, member))