Changes in kernel/generic/include/adt/list.h [b76ce3f:e98f1c3e] in mainline

File:

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

kernel/generic/include/adt/list.h

@@ -37 +37 @@
 #define KERN_LIST_H_
 
-#include <assert.h>
-#include <stdbool.h>
-#include <stddef.h>
+#include <debug.h>
+#include <typedefs.h>
 #include <trace.h>
 
@@ -53 +52 @@
 } list_t;
 
+
 extern bool list_member(const link_t *, const list_t *);
 extern void list_splice(list_t *, link_t *);
 extern unsigned long list_count(const list_t *);
 
+
 /** Declare and initialize statically allocated list.
  *
@@ -63 +64 @@
  */
 #define LIST_INITIALIZE(name) \
-        list_t name = LIST_INITIALIZER(name)
-
-/** Initializer for statically allocated list.
- * 
- * @code
- * struct named_list {
- *     const char *name;
- *     list_t list;
- * } var = { 
- *     .name = "default name", 
- *     .list = LIST_INITIALIZER(name_list.list) 
- * };
- * @endcode
- *
- * @param name Name of the new statically allocated list.
- *
- */
-#define LIST_INITIALIZER(name) \
-        { \
+        list_t name = { \
                 .head = { \
                         .prev = &(name).head, \
@@ -104 +87 @@
 
 /** Unlike list_foreach(), allows removing items while traversing a list.
- *
+ * 
  * @code
  * list_t mylist;
@@ -134 +117 @@
             iterator = next_iter, next_iter = iterator->next)
 
+        
 #define assert_link_not_used(link) \
-        assert(!link_used(link))
-
-/** Returns true if the link is definitely part of a list. False if not sure. */
-static inline bool link_in_use(const link_t *link)
-{
-        return link->prev != NULL && link->next != NULL;
-}
+        ASSERT(!link_used(link))
 
 /** Initialize doubly-linked circular list link
@@ -268 +246 @@
  *
  */
-static inline link_t *list_last(const list_t *list)
-{
-        return (list->head.prev == &list->head) ? NULL : list->head.prev;
+static inline link_t *list_last(list_t *list)
+{
+        return ((list->head.prev == &list->head) ? NULL : list->head.prev);
 }
 
@@ -280 +258 @@
  * @return Next item or NULL if @a link is the last item.
  */
-static inline link_t *list_next(const link_t *link, const list_t *list)
+static inline link_t *list_next(link_t *link, const list_t *list)
 {
         return (link->next == &list->head) ? NULL : link->next;
@@ -292 +270 @@
  * @return Previous item or NULL if @a link is the first item.
  */
-static inline link_t *list_prev(const link_t *link, const list_t *list)
+static inline link_t *list_prev(link_t *link, const list_t *list)
 {
         return (link->prev == &list->head) ? NULL : link->prev;
@@ -375 +353 @@
  *
  */
-static inline link_t *list_nth(const list_t *list, unsigned long n)
+static inline link_t *list_nth(list_t *list, unsigned long n)
 {
         unsigned long cnt = 0;
-        
-        link_t *link = list_first(list);
+        link_t *link;
+        
+        link = list_first(list);
         while (link != NULL) {
                 if (cnt == n)
@@ -410 +389 @@
                 return false;
 
-        assert(link->prev != NULL && link->next != NULL);
+        ASSERT(link->prev != NULL && link->next != NULL);
         return true;
 }