Changeset f1d6866 in mainline for uspace/lib/c/generic/adt/hash_table.c

Timestamp:

2011-09-18T21:22:59Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

dcc44ca1

Parents:

85ff862 (diff), 45a9cf4 (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

File:

• uspace/lib/c/generic/adt/hash_table.c (modified) (3 diffs)

uspace/lib/c/generic/adt/hash_table.c

@@ -152 +152 @@
         
         if (keys == h->max_keys) {
-                link_t *cur;
-                
                 /*
                  * All keys are known, hash_table_find() can be used to find the
@@ -159 +157 @@
                  */
                 
-                cur = hash_table_find(h, key);
+                link_t *cur = hash_table_find(h, key);
                 if (cur) {
                         list_remove(cur);
@@ -174 +172 @@
         hash_index_t chain;
         for (chain = 0; chain < h->entries; chain++) {
-                link_t *cur;
-                
-                for (cur = h->entry[chain].head.next; cur != &h->entry[chain].head;
+                for (link_t *cur = h->entry[chain].head.next;
+                    cur != &h->entry[chain].head;
                     cur = cur->next) {
                         if (h->op->compare(key, keys, cur)) {