Index: uspace/app/sbi/src/bigint.c
===================================================================
--- uspace/app/sbi/src/bigint.c	(revision 10de84286f36c6e4f3f92d59c073639668ffe9a1)
+++ uspace/app/sbi/src/bigint.c	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -186,5 +186,5 @@
  *			to @a dval.
  */
-int bigint_get_value_int(bigint_t *bigint, int *dval)
+errno_t bigint_get_value_int(bigint_t *bigint, int *dval)
 {
 	bigint_t vval, diff;
Index: uspace/app/sbi/src/bigint.h
===================================================================
--- uspace/app/sbi/src/bigint.h	(revision 10de84286f36c6e4f3f92d59c073639668ffe9a1)
+++ uspace/app/sbi/src/bigint.h	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -38,5 +38,5 @@
 void bigint_destroy(bigint_t *bigint);
 
-int bigint_get_value_int(bigint_t *bigint, int *dval);
+errno_t bigint_get_value_int(bigint_t *bigint, int *dval);
 bool_t bigint_is_zero(bigint_t *bigint);
 bool_t bigint_is_negative(bigint_t *bigint);
Index: uspace/app/sbi/src/builtin/bi_char.c
===================================================================
--- uspace/app/sbi/src/builtin/bi_char.c	(revision 10de84286f36c6e4f3f92d59c073639668ffe9a1)
+++ uspace/app/sbi/src/builtin/bi_char.c	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -73,5 +73,5 @@
         char *str;
         int char_val;
-        int rc;
+        errno_t rc;
 
 #ifdef DEBUG_RUN_TRACE
Index: uspace/app/sbi/src/builtin/bi_console.c
===================================================================
--- uspace/app/sbi/src/builtin/bi_console.c	(revision 10de84286f36c6e4f3f92d59c073639668ffe9a1)
+++ uspace/app/sbi/src/builtin/bi_console.c	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -107,5 +107,5 @@
 	rdata_var_t *var;
 	int char_val;
-	int rc;
+	errno_t rc;
 
 #ifdef DEBUG_RUN_TRACE
Index: uspace/app/sbi/src/builtin/bi_string.c
===================================================================
--- uspace/app/sbi/src/builtin/bi_string.c	(revision 10de84286f36c6e4f3f92d59c073639668ffe9a1)
+++ uspace/app/sbi/src/builtin/bi_string.c	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -125,5 +125,5 @@
 	int length;
 
-	int rc;
+	errno_t rc;
 
 	/* Extract self.Value */
Index: uspace/app/sbi/src/input.c
===================================================================
--- uspace/app/sbi/src/input.c	(revision 10de84286f36c6e4f3f92d59c073639668ffe9a1)
+++ uspace/app/sbi/src/input.c	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -45,5 +45,5 @@
 #define INPUT_BUFFER_SIZE 256
 
-static int input_init_file(input_t *input, const char *fname);
+static errno_t input_init_file(input_t *input, const char *fname);
 static void input_init_interactive(input_t *input);
 static void input_init_string(input_t *input, const char *str);
@@ -57,5 +57,5 @@
  *			ENOENT when opening file fails.
  */
-int input_new_file(input_t **input, const char *fname)
+errno_t input_new_file(input_t **input, const char *fname)
 {
 	*input = malloc(sizeof(input_t));
@@ -71,5 +71,5 @@
  * @return		EOK on success, ENOMEM when allocation fails.
  */
-int input_new_interactive(input_t **input)
+errno_t input_new_interactive(input_t **input)
 {
 	*input = malloc(sizeof(input_t));
@@ -87,5 +87,5 @@
  * @return		EOK on success, ENOMEM when allocation fails.
  */
-int input_new_string(input_t **input, const char *str)
+errno_t input_new_string(input_t **input, const char *str)
 {
 	*input = malloc(sizeof(input_t));
@@ -104,5 +104,5 @@
  * @return		EOK on success, ENOENT when opening file fails.
 */
-static int input_init_file(input_t *input, const char *fname)
+static errno_t input_init_file(input_t *input, const char *fname)
 {
 	FILE *f;
@@ -174,5 +174,5 @@
  * @return		EOK on success, EIO on failure.
  */
-int input_get_line(input_t *input, char **line)
+errno_t input_get_line(input_t *input, char **line)
 {
 	const char *prompt;
Index: uspace/app/sbi/src/input.h
===================================================================
--- uspace/app/sbi/src/input.h	(revision 10de84286f36c6e4f3f92d59c073639668ffe9a1)
+++ uspace/app/sbi/src/input.h	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -32,9 +32,9 @@
 #include "mytypes.h"
 
-int input_new_file(input_t **input, const char *fname);
-int input_new_interactive(input_t **input);
-int input_new_string(input_t **input, const char *str);
+errno_t input_new_file(input_t **input, const char *fname);
+errno_t input_new_interactive(input_t **input);
+errno_t input_new_string(input_t **input, const char *str);
 
-int input_get_line(input_t *input, char **line);
+errno_t input_get_line(input_t *input, char **line);
 int input_get_line_no(input_t *input);
 
Index: uspace/app/sbi/src/lex.c
===================================================================
--- uspace/app/sbi/src/lex.c	(revision 10de84286f36c6e4f3f92d59c073639668ffe9a1)
+++ uspace/app/sbi/src/lex.c	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -257,5 +257,5 @@
 void lex_init(lex_t *lex, struct input *input)
 {
-	int rc;
+	errno_t rc;
 
 	lex->input = input;
@@ -717,5 +717,5 @@
 {
 	char *bp;
-	int rc;
+	errno_t rc;
 
 	bp = lex->ibp;
Index: uspace/app/sbi/src/main.c
===================================================================
--- uspace/app/sbi/src/main.c	(revision 10de84286f36c6e4f3f92d59c073639668ffe9a1)
+++ uspace/app/sbi/src/main.c	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -61,5 +61,5 @@
 	stype_t stype;
 	run_t run;
-	int rc;
+	errno_t rc;
 
 	/* Store executable file path under which we have been invoked. */
Index: uspace/app/sbi/src/os/helenos.c
===================================================================
--- uspace/app/sbi/src/os/helenos.c	(revision 10de84286f36c6e4f3f92d59c073639668ffe9a1)
+++ uspace/app/sbi/src/os/helenos.c	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -151,5 +151,5 @@
  *			EIO on decoding error.
  */
-int os_str_get_char(const char *str, int index, int *out_char)
+errno_t os_str_get_char(const char *str, int index, int *out_char)
 {
 	size_t offset;
@@ -210,8 +210,8 @@
  * @param ptr	Place to store pointer to new string.
  */
-int os_input_line(const char *prompt, char **ptr)
+errno_t os_input_line(const char *prompt, char **ptr)
 {
 	char *line;
-	int rc;
+	errno_t rc;
 
 	if (tinput == NULL) {
@@ -247,10 +247,10 @@
  *		Command is present just one, not duplicated.
  */
-int os_exec(char *const cmd[])
+errno_t os_exec(char *const cmd[])
 {
 	task_id_t tid;
 	task_wait_t twait;
 	task_exit_t texit;
-	int rc;
+	errno_t rc;
 	int retval;
 
Index: uspace/app/sbi/src/os/os.h
===================================================================
--- uspace/app/sbi/src/os/os.h	(revision 10de84286f36c6e4f3f92d59c073639668ffe9a1)
+++ uspace/app/sbi/src/os/os.h	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -35,9 +35,9 @@
 char *os_str_dup(const char *str);
 size_t os_str_length(const char *str);
-int os_str_get_char(const char *str, int index, int *out_char);
+errno_t os_str_get_char(const char *str, int index, int *out_char);
 char *os_chr_to_astr(wchar_t chr);
 void os_input_disp_help(void);
-int os_input_line(const char *prompt, char **ptr);
-int os_exec(char * const cmd[]);
+errno_t os_input_line(const char *prompt, char **ptr);
+errno_t os_exec(char * const cmd[]);
 
 void os_store_ef_path(char *path);
Index: uspace/app/sbi/src/os/posix.c
===================================================================
--- uspace/app/sbi/src/os/posix.c	(revision 10de84286f36c6e4f3f92d59c073639668ffe9a1)
+++ uspace/app/sbi/src/os/posix.c	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -114,5 +114,5 @@
  * @return	Zero if equal, nonzero if not equal
  */
-int os_str_cmp(const char *a, const char *b)
+errno_t os_str_cmp(const char *a, const char *b)
 {
 	return strcmp(a, b);
@@ -147,5 +147,5 @@
  *			EIO on decoding error.
  */
-int os_str_get_char(const char *str, int index, int *out_char)
+errno_t os_str_get_char(const char *str, int index, int *out_char)
 {
 	size_t len;
@@ -193,5 +193,5 @@
  * @param ptr	Place to store pointer to new string.
  */
-int os_input_line(const char *prompt, char **ptr)
+errno_t os_input_line(const char *prompt, char **ptr)
 {
 	printf("%s", prompt);
@@ -214,5 +214,5 @@
  *		Command is present just one, not duplicated.
  */
-int os_exec(char *const cmd[])
+errno_t os_exec(char *const cmd[])
 {
 	pid_t pid;
Index: uspace/app/sbi/src/program.c
===================================================================
--- uspace/app/sbi/src/program.c	(revision 10de84286f36c6e4f3f92d59c073639668ffe9a1)
+++ uspace/app/sbi/src/program.c	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -55,10 +55,10 @@
  *			EINVAL if file has syntax errors.
  */
-int program_file_process(stree_program_t *program, const char *fname)
+errno_t program_file_process(stree_program_t *program, const char *fname)
 {
 	input_t *input;
 	lex_t lex;
 	parse_t parse;
-	int rc;
+	errno_t rc;
 
 	rc = input_new_file(&input, fname);
@@ -91,7 +91,7 @@
  *			has syntax errors.
  */
-int program_lib_process(stree_program_t *program)
+errno_t program_lib_process(stree_program_t *program)
 {
-	int rc;
+	errno_t rc;
 	char *path, *fname;
 	char *tmp;
Index: uspace/app/sbi/src/program.h
===================================================================
--- uspace/app/sbi/src/program.h	(revision 10de84286f36c6e4f3f92d59c073639668ffe9a1)
+++ uspace/app/sbi/src/program.h	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -32,6 +32,6 @@
 #include "mytypes.h"
 
-int program_file_process(stree_program_t *program, const char *fname);
-int program_lib_process(stree_program_t *program);
+errno_t program_file_process(stree_program_t *program, const char *fname);
+errno_t program_lib_process(stree_program_t *program);
 
 #endif
Index: uspace/app/sbi/src/run_expr.c
===================================================================
--- uspace/app/sbi/src/run_expr.c	(revision 10de84286f36c6e4f3f92d59c073639668ffe9a1)
+++ uspace/app/sbi/src/run_expr.c	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -1414,5 +1414,5 @@
 	int length;
 	int i;
-	int rc;
+	errno_t rc;
 	int iextent;
 
@@ -2287,5 +2287,5 @@
 	int elem_index;
 	int arg_val;
-	int rc;
+	errno_t rc;
 
 	rdata_item_t *ritem;
@@ -2476,5 +2476,5 @@
 	int elem_index;
 	int arg_val;
-	int rc1, rc2;
+	errno_t rc1, rc2;
 
 	rdata_value_t *value;
Index: uspace/app/sbi/src/stype.c
===================================================================
--- uspace/app/sbi/src/stype.c	(revision 10de84286f36c6e4f3f92d59c073639668ffe9a1)
+++ uspace/app/sbi/src/stype.c	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -1890,5 +1890,5 @@
  * @return		EOK if equal, EINVAL if not.
  */
-int stype_targs_check_equal(stype_t *stype, tdata_item_t *a_ti,
+errno_t stype_targs_check_equal(stype_t *stype, tdata_item_t *a_ti,
     tdata_item_t *b_ti)
 {
Index: uspace/app/sbi/src/stype.h
===================================================================
--- uspace/app/sbi/src/stype.h	(revision 10de84286f36c6e4f3f92d59c073639668ffe9a1)
+++ uspace/app/sbi/src/stype.h	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -50,5 +50,5 @@
 tdata_item_t *stype_tobject_find_pred(stype_t *stype, tdata_item_t *src,
     tdata_item_t *dest);
-int stype_targs_check_equal(stype_t *stype, tdata_item_t *a_ti,
+errno_t stype_targs_check_equal(stype_t *stype, tdata_item_t *a_ti,
     tdata_item_t *b_ti);
 
