Changeset ff381a7 in mainline for uspace/srv/ns/task.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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) (1 diff)

uspace/srv/ns/task.c

@@ -231 +231 @@
 int ns_task_id_intro(ipc_call_t *call)
 {
-        
         task_id_t id = MERGE_LOUP32(IPC_GET_ARG1(*call), IPC_GET_ARG2(*call));
-
+        
         ht_link_t *link = hash_table_find(&phone_to_id, &call->in_phone_hash);
         if (link != NULL)
-                return EEXISTS;
+                return EEXIST;
         
         p2i_entry_t *entry = (p2i_entry_t *) malloc(sizeof(p2i_entry_t));