Changes in uspace/srv/ns/task.c [feeac0d:3e6a98c5] in mainline

File:

• uspace/srv/ns/task.c (modified) (5 diffs)

uspace/srv/ns/task.c

@@ -179 +179 @@
         
 loop:
-        list_foreach(pending_wait, link, pending_wait_t, pr) {
+        list_foreach(pending_wait, cur) {
+                pending_wait_t *pr = list_get_instance(cur, pending_wait_t, link);
+                
                 ht_link_t *link = hash_table_find(&task_hash_table, &pr->id);
                 if (!link)
@@ -196 +198 @@
                 
                 hash_table_remove(&task_hash_table, &pr->id);
-                list_remove(&pr->link);
+                list_remove(cur);
                 free(pr);
                 goto loop;
@@ -206 +208 @@
         sysarg_t retval;
         task_exit_t texit;
-        bool remove = false;
         
         ht_link_t *link = hash_table_find(&task_hash_table, &id);
@@ -234 +235 @@
         }
         
-        remove = true;
+        hash_table_remove_item(&task_hash_table, link);
         retval = EOK;
         
@@ -242 +243 @@
                 ipc_answer_2(callid, retval, texit, ht->retval);
         }
-        if (remove)
-                hash_table_remove_item(&task_hash_table, link);
 }