Changeset 25eec4e in mainline for uspace/srv/ns/task.c

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

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

uspace/srv/ns/task.c

@@ -34 +34 @@
 #include <ipc/ipc.h>
 #include <adt/hash_table.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <assert.h>
@@ -208 +208 @@
         sysarg_t retval;
         task_exit_t texit;
+        bool remove = false;
         
         ht_link_t *link = hash_table_find(&task_hash_table, &id);
@@ -235 +236 @@
         }
         
-        hash_table_remove_item(&task_hash_table, link);
+        remove = true;
         retval = EOK;
         
@@ -243 +244 @@
                 ipc_answer_2(callid, retval, texit, ht->retval);
         }
+        if (remove)
+                hash_table_remove_item(&task_hash_table, link);
 }