Changes in uspace/app/top/screen.c [87822ce:28a5ebd] in mainline

File:

• uspace/app/top/screen.c (modified) (4 diffs)

uspace/app/top/screen.c

@@ -534 +534 @@
 /** Get char with timeout
  *
- * @param sec Timeout in seconds
- * @param rch Place to store character on success
- * @return EOK on success, ETIMEOUT on time out, EIO on other error
  */
-errno_t tgetchar(sec_t sec, int *rch)
-{
-        errno_t rc;
-
+int tgetchar(sec_t sec)
+{
         /*
          * Reset timeleft whenever it is not positive.
@@ -553 +548 @@
          * update timeleft so that the next call to tgetchar()
          * will not wait as long. If there is no input,
-         * make timeleft zero and return ETIMEOUT.
+         * make timeleft zero and return -1.
          */
 
@@ -562 +557 @@
 
                 warning_timeleft -= timeleft;
-                rc = console_get_event_timeout(console, &event, &timeleft);
-                if (rc == ETIMEOUT) {
+                if (!console_get_event_timeout(console, &event, &timeleft)) {
                         timeleft = 0;
-                        return ETIMEOUT;
-                }
-
-                if (rc != EOK)
-                        return EIO;
-
+                        return -1;
+                }
                 warning_timeleft += timeleft;
 
@@ -577 +567 @@
         }
 
-        *rch = (int) c;
-        return EOK;
+        return (int) c;
 }