Changeset 5a6cc679 in mainline for uspace/lib/clui/tinput.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:

• uspace/lib/clui/tinput.c (modified) (6 diffs)

uspace/lib/clui/tinput.c

@@ -185 +185 @@
 }
 
-static int tinput_display(tinput_t *ti)
+static errno_t tinput_display(tinput_t *ti)
 {
         sysarg_t col0, row0;
@@ -542 +542 @@
 {
         char *str;
-        int rc = clipboard_get_str(&str);
+        errno_t rc = clipboard_get_str(&str);
         
         if ((rc != EOK) || (str == NULL)) {
@@ -667 +667 @@
         size_t cnum;
         size_t i;
-        int rc;
+        errno_t rc;
 
         if (ti->compl_ops == NULL)
@@ -782 +782 @@
  * @return              EOK on success, ENOMEM if out of memory.
  */
-int tinput_set_prompt(tinput_t *ti, const char *prompt)
+errno_t tinput_set_prompt(tinput_t *ti, const char *prompt)
 {
         if (ti->prompt != NULL)
@@ -863 +863 @@
  *
  */
-int tinput_read_i(tinput_t *ti, const char *istr, char **dstr)
+errno_t tinput_read_i(tinput_t *ti, const char *istr, char **dstr)
 {
         console_flush(ti->console);
@@ -925 +925 @@
  *
  */
-int tinput_read(tinput_t *ti, char **dstr)
+errno_t tinput_read(tinput_t *ti, char **dstr)
 {
         return tinput_read_i(ti, "", dstr);