Changeset 3842a955 in mainline for kernel/generic/src

Timestamp:

2011-06-19T15:59:42Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

26e7d6d

Parents:

9724d7f (diff), 74464e8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Location:

kernel/generic/src/adt

Files:

• hash_table.c (modified) (2 diffs)
• list.c (modified) (1 diff)

kernel/generic/src/adt/hash_table.c

@@ -147 +147 @@
         ASSERT(keys <= h->max_keys);
         
+        
         if (keys == h->max_keys) {
                 link_t *cur;
-        
+                
                 /*
                  * All keys are known, hash_table_find() can be used to find the entry.
@@ -168 +169 @@
          */
         for (chain = 0; chain < h->entries; chain++) {
-                list_foreach(h->entry[chain], cur) {
+                link_t *cur;
+                for (cur = h->entry[chain].head.next; cur != &h->entry[chain].head;
+                    cur = cur->next) {
                         if (h->op->compare(key, keys, cur)) {
                                 link_t *hlp;

kernel/generic/src/adt/list.c

@@ -90 +90 @@
 }
 
+/** Count list items
+ *
+ * Return the number of items in the list.
+ *
+ * @param list          List to count.
+ * @return              Number of items in the list.
+ */
+unsigned int list_count(const list_t *list)
+{
+        unsigned int count = 0;
+        
+        list_foreach(*list, link) {
+                count++;
+        }
+        
+        return count;
+}
+
 /** @}
  */