Changeset 241f1985 in mainline for uspace/lib/c/generic/task.c

Timestamp:

2019-08-31T10:45:17Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

102f641

Parents:

f92b315

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-08-23 22:04:34)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-31 10:45:17)

Message:

Correcting failure from previous merge

The commits from Michal Koutný from the branch system-daemon
where built on a old version of Helenos. Because of this
many types and API functions have changed. This commit
upgrades the merge code

File:

• uspace/lib/c/generic/task.c (modified) (3 diffs)

uspace/lib/c/generic/task.c

@@ -385 +385 @@
         if (rc == EOK || rc == EINTR) {
                 if (wait->flags & TASK_WAIT_EXIT && texit)
-                        *texit = ipc_get_arg1(wait->result);
+                        *texit = ipc_get_arg1(&wait->result);
                 if (wait->flags & TASK_WAIT_RETVAL && retval)
-                        *retval = ipc_get_arg2(wait->result);
+                        *retval = ipc_get_arg2(&wait->result);
                 
         }
@@ -394 +394 @@
                 /* Is there another wait to be done? Wait for it! */
                 int old_flags = wait->flags;
-                wait->flags = ipc_get_arg3(wait->result);
+                wait->flags = ipc_get_arg3(&wait->result);
                 if (wait->flags != 0 && (old_flags & TASK_WAIT_BOTH)) {
                         rc = task_setup_wait(wait->tid, wait);
@@ -438 +438 @@
                 return EIO;
 
-        errno_t rc = (int) async_req_2_0(exch, TASKMAN_RETVAL, val, wait_for_exit);
+        errno_t rc = async_req_2_0(exch, TASKMAN_RETVAL, val, wait_for_exit);
         taskman_exchange_end(exch);