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

File:

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

kernel/generic/include/adt/list.h

@@ -51 +51 @@
 } list_t;
 
-
-extern int list_member(const link_t *, const list_t *);
-extern void list_splice(list_t *, link_t *);
-extern unsigned int list_count(const list_t *);
-
-
 /** Declare and initialize statically allocated list.
  *
@@ -77 +71 @@
             iterator != &(list).head; iterator = iterator->next)
 
-/** Unlike list_foreach(), allows removing items while traversing a list.
- * 
- * @code
- * list_t mylist;
- * typedef struct item {
- *     int value;
- *     link_t item_link;
- * } item_t;
- * 
- * //..
- * 
- * // Print each list element's value and remove the element from the list.
- * list_foreach_safe(mylist, cur_link, next_link) {
- *     item_t *cur_item = list_get_instance(cur_link, item_t, item_link);
- *     printf("%d\n", cur_item->value);
- *     list_remove(cur_link);
- * }
- * @endcode
- * 
- * @param list List to traverse.
- * @param iterator Iterator to the current element of the list.
- *             The item this iterator points may be safely removed
- *             from the list.
- * @param next_iter Iterator to the next element of the list.
- */
-#define list_foreach_safe(list, iterator, next_iter) \
-        for (link_t *iterator = (list).head.next, \
-                *next_iter = iterator->next; \
-                iterator != &(list).head; \
-                iterator = next_iter, next_iter = iterator->next)
-
-        
 #define assert_link_not_used(link) \
         ASSERT(((link)->prev == NULL) && ((link)->next == NULL))
@@ -123 +85 @@
         link->prev = NULL;
         link->next = NULL;
-}
-
-/** Returns true if the initialized link is already in use by any list.
- * 
- * @param link Link to examine whether if belongs to a list or not.
- * @return 1 if the link is part of a list. 
- * @return 0 otherwise.
- */
-NO_TRACE static inline int link_used(const link_t *link)
-{
-        return link->prev != NULL || link->next != NULL;
 }
 
@@ -305 +256 @@
 {
         headless_list_split_or_concat(part1, part2);
-}
-
-/** Concatenate two lists
- *
- * Concatenate lists @a list1 and @a list2, producing a single
- * list @a list1 containing items from both (in @a list1, @a list2
- * order) and empty list @a list2.
- *
- * @param list1         First list and concatenated output
- * @param list2         Second list and empty output.
- *
- */
-NO_TRACE static inline void list_concat(list_t *list1, list_t *list2)
-{
-        list_splice(list2, list1->head.prev);
 }
 
@@ -345 +281 @@
 }
 
+extern int list_member(const link_t *, const list_t *);
+extern void list_concat(list_t *, list_t *);
+extern unsigned int list_count(const list_t *);
+
 #endif