Changeset 2246de6 in mainline

Timestamp:

2009-05-21T06:57:08Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

cb41a5e

Parents:

55982d6

Message:

add list_count()
cstyle

Location:

uspace/lib/libc

Files:

• generic/libadt/list.c (modified) (3 diffs)
• include/libadt/list.h (modified) (5 diffs)

uspace/lib/libc/generic/libadt/list.c

@@ -49 +49 @@
 int list_member(const link_t *link, const link_t *head)
 {
-        int found = false;
+        int found = 0;
         link_t *hlp = head->next;
         
         while (hlp != head) {
                 if (hlp == link) {
-                        found = true;
+                        found = 1;
                         break;
                 }
@@ -78 +78 @@
         if (list_empty(head2))
                 return;
-
+        
         head2->next->prev = head1->prev;
-        head2->prev->next = head1;      
+        head2->prev->next = head1;
         head1->prev->next = head2->next;
         head1->prev = head2->prev;
@@ -86 +86 @@
 }
 
+
+/** Count list items
+ *
+ * Return the number of items in the list.
+ *
+ * @param link List to count.
+ *
+ * @return Number of items in the list.
+ *
+ */
+unsigned int list_count(const link_t *link)
+{
+        unsigned int count = 0;
+        link_t *hlp = link->next;
+        
+        while (hlp != link) {
+                count++;
+                hlp = hlp->next;
+        }
+        
+        return count;
+}
+
 /** @}
  */

uspace/lib/libc/include/libadt/list.h

@@ -38 +38 @@
 #include <unistd.h>
 
-#ifndef true
-# define true 1
-#endif
-#ifndef false
-# define false 0
-#endif
-
-typedef struct link link_t;
-
 /** Doubly linked list head and link type. */
-struct link {
-        link_t *prev;   /**< Pointer to the previous item in the list. */
-        link_t *next;   /**< Pointer to the next item in the list. */
-};
+typedef struct link {
+        struct link *prev;  /**< Pointer to the previous item in the list. */
+        struct link *next;  /**< Pointer to the next item in the list. */
+} link_t;
 
 /** Declare and initialize statically allocated list.
@@ -57 +48 @@
  * @param name Name of the new statically allocated list.
  */
-#define LIST_INITIALIZE(name)           link_t name = { .prev = &name, .next = &name }
+#define LIST_INITIALIZE(name)  link_t name = { \
+        .prev = &name, \
+        .next = &name \
+}
 
 /** Initialize doubly-linked circular list link
@@ -146 +140 @@
 static inline int list_empty(link_t *head)
 {
-        return head->next == head ? true : false;
+        return ((head->next == head) ? 1 : 0);
 }
 
@@ -162 +156 @@
 static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
 {
-        link_t *hlp;
-
         part1->prev->next = part2;
-        part2->prev->next = part1;      
-        hlp = part1->prev;
+        part2->prev->next = part1;
+        
+        link_t *hlp = part1->prev;
+        
         part1->prev = part2->prev;
         part2->prev = hlp;
@@ -196 +190 @@
 }
 
-#define list_get_instance(link,type,member) (type *)(((char *)(link))-((char *)&(((type *)NULL)->member)))
+#define list_get_instance(link, type, member)  ((type *) (((void *)(link)) - ((void *) &(((type *) NULL)->member))))
 
 extern int list_member(const link_t *link, const link_t *head);
 extern void list_concat(link_t *head1, link_t *head2);
+extern unsigned int list_count(const link_t *link);
 
 #endif