Changes in uspace/lib/c/include/adt/list.h [07525cd:062d900] in mainline

File:

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

uspace/lib/c/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.
  *
@@ -65 +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)
+        ((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)
 
 /** Unlike list_foreach(), allows removing items while traversing a list.
- *
+ * 
  * @code
  * list_t mylist;
@@ -240 +238 @@
 static inline link_t *list_last(list_t *list)
 {
-        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;
+        return ((list->head.prev == &list->head) ? NULL : list->head.prev);
 }
 
@@ -336 +308 @@
         unsigned int cnt = 0;
         
-        link_t *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;
 }