Changeset 3842a955 in mainline for uspace/lib/c/include/ipc/devman.h

Timestamp:

2011-06-19T15:59:42Z (13 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

File:

• uspace/lib/c/include/ipc/devman.h (modified) (3 diffs)

uspace/lib/c/include/ipc/devman.h

@@ -72 +72 @@
  */
 typedef struct match_id_list {
-        link_t ids;
+        list_t ids;
 } match_id_list_t;
 
@@ -95 +95 @@
 {
         match_id_t *mid = NULL;
-        link_t *link = ids->ids.next;
+        link_t *link = ids->ids.head.next;
         
-        while (link != &ids->ids) {
+        while (link != &ids->ids.head) {
                 mid = list_get_instance(link, match_id_t,link);
                 if (mid->score < id->score) {
                         break;
-                }       
+                }
                 link = link->next;
         }
@@ -118 +118 @@
         match_id_t *id;
         
-        while(!list_empty(&ids->ids)) {
-                link = ids->ids.next;
-                list_remove(link);              
+        while (!list_empty(&ids->ids)) {
+                link = list_first(&ids->ids);
+                list_remove(link);
                 id = list_get_instance(link, match_id_t, link);
-                delete_match_id(id);            
-        }       
+                delete_match_id(id);
+        }
 }