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

Timestamp:

2018-01-31T02:21:24Z (8 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/console/console.c (modified) (2 diffs)

kernel/generic/src/console/console.c

@@ -391 +391 @@
  *
  */
-sysarg_t sys_kio(int cmd, const void *buf, size_t size)
+sys_errno_t sys_kio(int cmd, const void *buf, size_t size)
 {
         char *data;
-        int rc;
+        errno_t rc;
 
         switch (cmd) {
@@ -408 +408 @@
 
         if (size > PAGE_SIZE)
-                return (sysarg_t) ELIMIT;
+                return (sys_errno_t) ELIMIT;
         
         if (size > 0) {
                 data = (char *) malloc(size + 1, 0);
                 if (!data)
-                        return (sysarg_t) ENOMEM;
+                        return (sys_errno_t) ENOMEM;
                 
                 rc = copy_from_uspace(data, buf, size);
                 if (rc) {
                         free(data);
-                        return (sysarg_t) rc;
+                        return (sys_errno_t) rc;
                 }
                 data[size] = 0;