Changeset 132ab5d1 in mainline for uspace/lib/posix/source/sys/wait.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/posix/source/sys/wait.c (modified) (2 diffs)

uspace/lib/posix/source/sys/wait.c

@@ -42 +42 @@
 #include "libc/task.h"
 #include "posix/assert.h"
-#include "posix/errno.h"
+
+#include <errno.h>
+
 #include "posix/limits.h"
 #include "posix/signal.h"
@@ -100 +102 @@
         int retval;
         
-        int rc = task_wait_task_id((task_id_t) pid, &texit, &retval);
-        
-        if (rc < 0) {
+        if (failed(task_wait_task_id((task_id_t) pid, &texit, &retval))) {
                 /* Unable to retrieve status. */
-                errno = -rc;
                 return (posix_pid_t) -1;
         }