Changeset 96b02eb9 in mainline for kernel/generic/src/security/cap.c

Timestamp:

2010-12-14T12:52:38Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6b10dab

Parents:

554debd

Message:

more unification of basic types

• use sysarg_t and native_t (unsigned and signed variant) in both kernel and uspace
• remove ipcarg_t in favour of sysarg_t

(no change in functionality)

File:

• kernel/generic/src/security/cap.c (modified) (5 diffs)

kernel/generic/src/security/cap.c

@@ -85 +85 @@
  *
  */
-unative_t sys_cap_grant(sysarg64_t *uspace_taskid_arg, cap_t caps)
+sysarg_t sys_cap_grant(sysarg64_t *uspace_taskid_arg, cap_t caps)
 {
         if (!(cap_get(TASK) & CAP_CAP))
-                return (unative_t) EPERM;
+                return (sysarg_t) EPERM;
         
         sysarg64_t taskid_arg;
         int rc = copy_from_uspace(&taskid_arg, uspace_taskid_arg, sizeof(sysarg64_t));
         if (rc != 0)
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         
         irq_spinlock_lock(&tasks_lock, true);
@@ -100 +100 @@
         if ((!task) || (!context_check(CONTEXT, task->context))) {
                 irq_spinlock_unlock(&tasks_lock, true);
-                return (unative_t) ENOENT;
+                return (sysarg_t) ENOENT;
         }
         
@@ -122 +122 @@
  *
  */
-unative_t sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps)
+sysarg_t sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps)
 {
         sysarg64_t taskid_arg;
         int rc = copy_from_uspace(&taskid_arg, uspace_taskid_arg, sizeof(sysarg64_t));
         if (rc != 0)
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         
         irq_spinlock_lock(&tasks_lock, true);
@@ -134 +134 @@
         if ((!task) || (!context_check(CONTEXT, task->context))) {
                 irq_spinlock_unlock(&tasks_lock, true);
-                return (unative_t) ENOENT;
+                return (sysarg_t) ENOENT;
         }
         
@@ -147 +147 @@
                 irq_spinlock_unlock(&TASK->lock, false);
                 irq_spinlock_unlock(&tasks_lock, true);
-                return (unative_t) EPERM;
+                return (sysarg_t) EPERM;
         }