Index: uspace/lib/clui/nchoice.c
===================================================================
--- uspace/lib/clui/nchoice.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/clui/nchoice.c	(revision 2ca5a198f7308b0c892b04c0fcda44f5e83eb8f0)
@@ -43,8 +43,8 @@
  *
  */
-int nchoice_create(nchoice_t **rchoice)
+errno_t nchoice_create(nchoice_t **rchoice)
 {
 	nchoice_t *choice = NULL;
-	int rc;
+	errno_t rc;
 
 	choice = calloc(1, sizeof(nchoice_t));
@@ -82,5 +82,5 @@
 
 /** Set numerica choice prompt text */
-int nchoice_set_prompt(nchoice_t *choice, const char *prompt)
+errno_t nchoice_set_prompt(nchoice_t *choice, const char *prompt)
 {
 	char *pstr;
@@ -96,5 +96,5 @@
 
 /** Add option to numerical choice */
-int nchoice_add(nchoice_t *choice, const char *opttext, void *arg,
+errno_t nchoice_add(nchoice_t *choice, const char *opttext, void *arg,
     nchoice_flag_t flags)
 {
@@ -127,8 +127,8 @@
 
 /** Get numerical choice from user */
-int nchoice_get(nchoice_t *choice, void **rarg)
+errno_t nchoice_get(nchoice_t *choice, void **rarg)
 {
 	int i;
-	int rc;
+	errno_t rc;
 	int ret;
 	char *str;
Index: uspace/lib/clui/nchoice.h
===================================================================
--- uspace/lib/clui/nchoice.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/clui/nchoice.h	(revision 2ca5a198f7308b0c892b04c0fcda44f5e83eb8f0)
@@ -65,9 +65,9 @@
 } nchoice_t;
 
-extern int nchoice_create(nchoice_t **);
+extern errno_t nchoice_create(nchoice_t **);
 extern void nchoice_destroy(nchoice_t *);
-extern int nchoice_set_prompt(nchoice_t *, const char *);
-extern int nchoice_add(nchoice_t *, const char *, void *, nchoice_flag_t);
-extern int nchoice_get(nchoice_t *, void **);
+extern errno_t nchoice_set_prompt(nchoice_t *, const char *);
+extern errno_t nchoice_add(nchoice_t *, const char *, void *, nchoice_flag_t);
+extern errno_t nchoice_get(nchoice_t *, void **);
 
 #endif
Index: uspace/lib/clui/tinput.c
===================================================================
--- uspace/lib/clui/tinput.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/clui/tinput.c	(revision 2ca5a198f7308b0c892b04c0fcda44f5e83eb8f0)
@@ -185,5 +185,5 @@
 }
 
-static int tinput_display(tinput_t *ti)
+static errno_t tinput_display(tinput_t *ti)
 {
 	sysarg_t col0, row0;
@@ -542,5 +542,5 @@
 {
 	char *str;
-	int rc = clipboard_get_str(&str);
+	errno_t rc = clipboard_get_str(&str);
 	
 	if ((rc != EOK) || (str == NULL)) {
@@ -667,5 +667,5 @@
 	size_t cnum;
 	size_t i;
-	int rc;
+	errno_t rc;
 
 	if (ti->compl_ops == NULL)
@@ -782,5 +782,5 @@
  * @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,5 +863,5 @@
  *
  */
-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,5 +925,5 @@
  *
  */
-int tinput_read(tinput_t *ti, char **dstr)
+errno_t tinput_read(tinput_t *ti, char **dstr)
 {
 	return tinput_read_i(ti, "", dstr);
Index: uspace/lib/clui/tinput.h
===================================================================
--- uspace/lib/clui/tinput.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/clui/tinput.h	(revision 2ca5a198f7308b0c892b04c0fcda44f5e83eb8f0)
@@ -63,5 +63,5 @@
  * @return		EOK on success, error code on failure.
  */
-typedef int (*tinput_compl_init_fn)(wchar_t *text, size_t pos, size_t *cstart,
+typedef errno_t (*tinput_compl_init_fn)(wchar_t *text, size_t pos, size_t *cstart,
     void **state);
 
@@ -78,5 +78,5 @@
  * @return		EOK on success, error code on failure.
  */
-typedef int (*tinput_compl_get_next_fn)(void *state, char **compl);
+typedef errno_t (*tinput_compl_get_next_fn)(void *state, char **compl);
 
 
@@ -155,9 +155,9 @@
 
 extern tinput_t *tinput_new(void);
-extern int tinput_set_prompt(tinput_t *, const char *);
+extern errno_t tinput_set_prompt(tinput_t *, const char *);
 extern void tinput_set_compl_ops(tinput_t *, tinput_compl_ops_t *);
 extern void tinput_destroy(tinput_t *);
-extern int tinput_read(tinput_t *, char **);
-extern int tinput_read_i(tinput_t *, const char *, char **);
+extern errno_t tinput_read(tinput_t *, char **);
+extern errno_t tinput_read_i(tinput_t *, const char *, char **);
 
 #endif