Changes in kernel/generic/include/adt/list.h [7856d09:9d58539] in mainline

File:

• kernel/generic/include/adt/list.h (modified) (5 diffs)

kernel/generic/include/adt/list.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2001-2004 Jakub Jermar
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 #define KERN_LIST_H_
 
-#include <debug.h>
 #include <typedefs.h>
 #include <trace.h>
@@ -66 +65 @@
 
 #define list_get_instance(link, type, member) \
-        ((type *) (((void *)(link)) - list_link_to_void(&(((type *) NULL)->member))))
-
-#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)
+        ((type *) (((void *)(link)) - ((void *) &(((type *) NULL)->member))))
+
+#define list_foreach(list, iterator) \
+        for (link_t *iterator = (list).head.next; \
+            iterator != &(list).head; iterator = iterator->next)
 
 #define assert_link_not_used(link) \
-        ASSERT(!link_used(link))
+        ASSERT(((link)->prev == NULL) && ((link)->next == NULL))
 
 /** Initialize doubly-linked circular list link
@@ -213 +204 @@
 }
 
-/** 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;
-}
-
 /** Split or concatenate headless doubly-linked circular list
  *
@@ -303 +270 @@
 {
         unsigned int cnt = 0;
-        link_t *link;
-        
-        link = list_first(list);
-        while (link != NULL) {
+        
+        list_foreach(*list, link) {
                 if (cnt == n)
                         return link;
                 
                 cnt++;
-                link = list_next(link, list);
         }
         
         return NULL;
-}
-
-/** Verify that argument type is a pointer to link_t (at compile time).
- *
- * This can be used to check argument type in a macro.
- */
-static inline const void *list_link_to_void(const link_t *link)
-{
-        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;
 }