Changeset 0c2d9bb in mainline for uspace/lib/c/include/adt/list.h

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/lib/c/include/adt/list.h (modified) (6 diffs)

uspace/lib/c/include/adt/list.h

@@ -38 +38 @@
 
 #include <assert.h>
+#include <stdbool.h>
 #include <unistd.h>
 
@@ -67 +68 @@
         ((type *) (((void *)(link)) - list_link_to_void(&(((type *) NULL)->member))))
 
-#define list_foreach(list, iterator) \
-        for (link_t *iterator = (list).head.next; \
-            iterator != &(list).head; iterator = iterator->next)
+#define list_foreach(list, member, itype, iterator) \
+        for (itype *iterator = NULL; iterator == NULL; iterator = (itype *) 1) \
+            for (link_t *_link = (list).head.next; \
+            iterator = list_get_instance(_link, itype, member), \
+            _link != &(list).head; _link = _link->next)
+
+#define list_foreach_rev(list, member, itype, iterator) \
+        for (itype *iterator = NULL; iterator == NULL; iterator = (itype *) 1) \
+            for (link_t *_link = (list).head.prev; \
+            iterator = list_get_instance(_link, itype, member), \
+            _link != &(list).head; _link = _link->prev)
 
 /** Unlike list_foreach(), allows removing items while traversing a list.
- * 
+ *
  * @code
  * list_t mylist;
@@ -103 +112 @@
 
 #define assert_link_not_used(link) \
-        assert(((link)->prev == NULL) && ((link)->next == NULL))
+        assert(!link_used(link))
 
 /** Returns true if the link is definitely part of a list. False if not sure. */
@@ -238 +247 @@
 static inline link_t *list_last(list_t *list)
 {
-        return ((list->head.prev == &list->head) ? NULL : list->head.prev);
+        return (list->head.prev == &list->head) ? NULL : list->head.prev;
+}
+
+/** Get next item in list.
+ *
+ * @param link Current item link
+ * @param list List containing @a link
+ *
+ * @return Next item or NULL if @a link is the last item.
+ *
+ */
+static inline link_t *list_next(link_t *link, const list_t *list)
+{
+        return (link->next == &list->head) ? NULL : link->next;
+}
+
+/** Get previous item in list.
+ *
+ * @param link Current item link
+ * @param list List containing @a link
+ *
+ * @return Previous item or NULL if @a link is the first item.
+ *
+ */
+static inline link_t *list_prev(link_t *link, const list_t *list)
+{
+        return (link->prev == &list->head) ? NULL : link->prev;
 }
 
@@ -308 +343 @@
         unsigned int cnt = 0;
         
-        list_foreach(*list, link) {
+        link_t *link = list_first(list);
+        while (link != NULL) {
                 if (cnt == n)
                         return link;
                 
                 cnt++;
+                link = list_next(link, list);
         }
         
@@ -325 +362 @@
 {
         return link;
+}
+
+/** Determine if link is used.
+ *
+ * @param link Link
+ * @return @c true if link is used, @c false if not.
+ */
+static inline bool link_used(link_t *link)
+{
+        if (link->prev == NULL && link->next == NULL)
+                return false;
+
+        assert(link->prev != NULL && link->next != NULL);
+        return true;
 }