Changeset 1787e527 in mainline for uspace/srv/ns/service.c

Timestamp:

2009-11-16T21:22:54Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5ebdf94

Parents:

fcbd1be (diff), 9c70ed6 (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:

merged with head (unstable)

File:

• uspace/srv/ns/service.c (modified) (2 diffs)

uspace/srv/ns/service.c

@@ -156 +156 @@
                 
                 hashed_service_t *hs = hash_table_get_instance(link, hashed_service_t, link);
-                ipcarg_t retval = ipc_forward_fast(pr->callid, hs->phone,
-                    pr->arg2, pr->arg3, 0, IPC_FF_NONE);
-                
-                if (!(pr->callid & IPC_CALLID_NOTIFICATION))
-                        ipc_answer_0(pr->callid, retval);
+                (void) ipc_forward_fast(pr->callid, hs->phone, pr->arg2,
+                    pr->arg3, 0, IPC_FF_NONE);
                 
                 list_remove(cur);
@@ -242 +239 @@
         
         hashed_service_t *hs = hash_table_get_instance(link, hashed_service_t, link);
-        retval = ipc_forward_fast(callid, hs->phone, IPC_GET_ARG2(*call),
+        (void) ipc_forward_fast(callid, hs->phone, IPC_GET_ARG2(*call),
             IPC_GET_ARG3(*call), 0, IPC_FF_NONE);
+        return;
         
 out: