Changeset 0c2d9bb in mainline for uspace/srv/ns/task.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/srv/ns/task.c (modified) (2 diffs)

uspace/srv/ns/task.c

@@ -179 +179 @@
         
 loop:
-        list_foreach(pending_wait, cur) {
-                pending_wait_t *pr = list_get_instance(cur, pending_wait_t, link);
-                
+        list_foreach(pending_wait, link, pending_wait_t, pr) {
                 ht_link_t *link = hash_table_find(&task_hash_table, &pr->id);
                 if (!link)
@@ -198 +196 @@
                 
                 hash_table_remove(&task_hash_table, &pr->id);
-                list_remove(cur);
+                list_remove(&pr->link);
                 free(pr);
                 goto loop;