Changeset 132ab5d1 in mainline for uspace/lib/c/generic/io/console.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/io/console.c (modified) (6 diffs)

uspace/lib/c/generic/io/console.c

@@ -38 +38 @@
 #include <async.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <vfs/vfs_sess.h>
 #include <io/console.h>
@@ -188 +188 @@
                 async_exchange_end(exch);
                 
-                sysarg_t rc;
+                int rc;
                 async_wait_for(aid, &rc);
                 
@@ -202 +202 @@
                 }
         } else {
-                sysarg_t retval;
+                int retval;
                 async_wait_for(ctrl->input_aid, &retval);
                 
@@ -208 +208 @@
                 
                 if (retval != EOK) {
-                        errno = (int) retval;
+                        errno = retval;
                         return false;
                 }
@@ -235 +235 @@
         }
         
-        sysarg_t retval;
+        int retval;
         int rc = async_wait_timeout(ctrl->input_aid, &retval, *timeout);
         if (rc != EOK) {
@@ -246 +246 @@
         
         if (retval != EOK) {
-                errno = (int) retval;
+                errno = retval;
                 return false;
         }