Changeset 132ab5d1 in mainline for uspace/lib/c/generic/task.c

Timestamp:

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

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, 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/c/generic/task.c (modified) (9 diffs)

uspace/lib/c/generic/task.c

@@ -45 +45 @@
 #include <errno.h>
 #include <ns.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <libc.h>
 #include "private/ns.h"
@@ -69 +69 @@
  *             program.
  *
- * @return Zero on success or negative error code.
+ * @return Zero on success or an error code.
  */
 int task_set_name(const char *name)
@@ -75 +75 @@
         assert(name);
         
-        return __SYSCALL2(SYS_TASK_SET_NAME, (sysarg_t) name, str_size(name));
+        return (int) __SYSCALL2(SYS_TASK_SET_NAME, (sysarg_t) name, str_size(name));
 }
 
@@ -82 +82 @@
  * @param task_id ID of task to kill.
  *
- * @return Zero on success or negative error code.
+ * @return Zero on success or an error code.
  */
 
@@ -101 +101 @@
  * @param argv Command-line arguments.
  *
- * @return Zero on success or negative error code.
+ * @return Zero on success or an error code.
  *
  */
@@ -143 +143 @@
  * @param std_err File to use as stderr.
  *
- * @return Zero on success or negative error code.
+ * @return Zero on success or an error code.
  *
  */
@@ -249 +249 @@
  * @param ap   Command-line arguments.
  *
- * @return Zero on success or negative error code.
+ * @return Zero on success or an error code.
  *
  */
@@ -287 +287 @@
  * @param ...  Command-line arguments.
  *
- * @return Zero on success or negative error code.
+ * @return Zero on success or an error code.
  *
  */
@@ -369 +369 @@
         assert(retval);
 
-        sysarg_t rc;
+        int rc;
         async_wait_for(wait->aid, &rc);