Changeset 5a6cc679 in mainline for uspace/lib/c/generic/perm.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:

• uspace/lib/c/generic/perm.c (modified) (2 diffs)

uspace/lib/c/generic/perm.c

@@ -48 +48 @@
  *
  */
-int perm_grant(task_id_t id, unsigned int perms)
+errno_t perm_grant(task_id_t id, unsigned int perms)
 {
 #ifdef __32_BITS__
         sysarg64_t arg = (sysarg64_t) id;
-        return (int) __SYSCALL2(SYS_PERM_GRANT, (sysarg_t) &arg, (sysarg_t) perms);
+        return (errno_t) __SYSCALL2(SYS_PERM_GRANT, (sysarg_t) &arg, (sysarg_t) perms);
 #endif
         
 #ifdef __64_BITS__
-        return (int) __SYSCALL2(SYS_PERM_GRANT, (sysarg_t) id, (sysarg_t) perms);
+        return (errno_t) __SYSCALL2(SYS_PERM_GRANT, (sysarg_t) id, (sysarg_t) perms);
 #endif
 }
@@ -68 +68 @@
  *
  */
-int perm_revoke(task_id_t id, unsigned int perms)
+errno_t perm_revoke(task_id_t id, unsigned int perms)
 {
 #ifdef __32_BITS__
         sysarg64_t arg = (sysarg64_t) id;
-        return (int) __SYSCALL2(SYS_PERM_REVOKE, (sysarg_t) &arg, (sysarg_t) perms);
+        return (errno_t) __SYSCALL2(SYS_PERM_REVOKE, (sysarg_t) &arg, (sysarg_t) perms);
 #endif
         
 #ifdef __64_BITS__
-        return (int) __SYSCALL2(SYS_PERM_REVOKE, (sysarg_t) id, (sysarg_t) perms);
+        return (errno_t) __SYSCALL2(SYS_PERM_REVOKE, (sysarg_t) id, (sysarg_t) perms);
 #endif
 }