Changeset 5a6cc679 in mainline for kernel/generic/src/proc/task.c

Timestamp:

2018-01-31T02:21:24Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• kernel/generic/src/proc/task.c (modified) (10 diffs)

kernel/generic/src/proc/task.c

@@ -83 +83 @@
 /* Forward declarations. */
 static void task_kill_internal(task_t *);
-static int tsk_constructor(void *, unsigned int);
+static errno_t tsk_constructor(void *, unsigned int);
 static size_t tsk_destructor(void *obj);
 
@@ -158 +158 @@
 }
 
-int tsk_constructor(void *obj, unsigned int kmflags)
+errno_t tsk_constructor(void *obj, unsigned int kmflags)
 {
         task_t *task = (task_t *) obj;
 
-        int rc = caps_task_alloc(task);
+        errno_t rc = caps_task_alloc(task);
         if (rc != EOK)
                 return rc;
@@ -246 +246 @@
             (container_check(ipc_phone_0->task->container, task->container))) {
                 cap_handle_t phone_handle;
-                int rc = phone_alloc(task, &phone_handle);
+                errno_t rc = phone_alloc(task, &phone_handle);
                 if (rc != EOK) {
                         task->as = NULL;
@@ -345 +345 @@
  *
  */
-sysarg_t sys_task_get_id(sysarg64_t *uspace_taskid)
+sys_errno_t sys_task_get_id(sysarg64_t *uspace_taskid)
 {
         /*
@@ -351 +351 @@
          * the lifespan of the task.
          */
-        return (sysarg_t) copy_to_uspace(uspace_taskid, &TASK->taskid,
+        return (sys_errno_t) copy_to_uspace(uspace_taskid, &TASK->taskid,
             sizeof(TASK->taskid));
 }
@@ -385 +385 @@
  *
  */
-sysarg_t sys_task_set_name(const char *uspace_name, size_t name_len)
+sys_errno_t sys_task_set_name(const char *uspace_name, size_t name_len)
 {
         char namebuf[TASK_NAME_BUFLEN];
@@ -393 +393 @@
                 name_len = TASK_NAME_BUFLEN - 1;
         
-        int rc = copy_from_uspace(namebuf, uspace_name, name_len);
-        if (rc != 0)
-                return (sysarg_t) rc;
+        errno_t rc = copy_from_uspace(namebuf, uspace_name, name_len);
+        if (rc != EOK)
+                return (sys_errno_t) rc;
         
         namebuf[name_len] = '\0';
@@ -426 +426 @@
  *
  */
-sysarg_t sys_task_kill(task_id_t *uspace_taskid)
+sys_errno_t sys_task_kill(task_id_t *uspace_taskid)
 {
         task_id_t taskid;
-        int rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(taskid));
-        if (rc != 0)
-                return (sysarg_t) rc;
-        
-        return (sysarg_t) task_kill(taskid);
+        errno_t rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(taskid));
+        if (rc != EOK)
+                return (sys_errno_t) rc;
+        
+        return (sys_errno_t) task_kill(taskid);
 }
 
@@ -539 +539 @@
  *
  */
-int task_kill(task_id_t id)
+errno_t task_kill(task_id_t id)
 {
         if (id == 1)
@@ -596 +596 @@
  *
  */
-sysarg_t sys_task_exit(sysarg_t notify)
+sys_errno_t sys_task_exit(sysarg_t notify)
 {
         task_kill_self(notify);