Index: kernel/generic/src/lib/str.c
===================================================================
--- kernel/generic/src/lib/str.c	(revision ee6f4342058a8205c52ba1e31e063a17c0cf6f18)
+++ kernel/generic/src/lib/str.c	(revision 36df27ebb72758daf4d2179e70f231ac0e059a83)
@@ -217,5 +217,5 @@
  *         code was invalid.
  */
-int chr_encode(const wchar_t ch, char *str, size_t *offset, size_t size)
+errno_t chr_encode(const wchar_t ch, char *str, size_t *offset, size_t size)
 {
 	if (*offset >= size)
@@ -794,5 +794,5 @@
  *
  */
-static int str_uint(const char *nptr, char **endptr, unsigned int base,
+static errno_t str_uint(const char *nptr, char **endptr, unsigned int base,
     bool *neg, uint64_t *result)
 {
@@ -915,5 +915,5 @@
  *
  */
-int str_uint64_t(const char *nptr, char **endptr, unsigned int base,
+errno_t str_uint64_t(const char *nptr, char **endptr, unsigned int base,
     bool strict, uint64_t *result)
 {
@@ -922,5 +922,5 @@
 	bool neg;
 	char *lendptr;
-	int ret = str_uint(nptr, &lendptr, base, &neg, result);
+	errno_t ret = str_uint(nptr, &lendptr, base, &neg, result);
 	
 	if (endptr != NULL)
Index: kernel/generic/src/lib/str_error.c
===================================================================
--- kernel/generic/src/lib/str_error.c	(revision ee6f4342058a8205c52ba1e31e063a17c0cf6f18)
+++ kernel/generic/src/lib/str_error.c	(revision 36df27ebb72758daf4d2179e70f231ac0e059a83)
@@ -40,5 +40,5 @@
 #define __errno_entry(name, num, desc) name,
 
-static const int err_num[] = {
+static const errno_t err_num[] = {
 #include <abi/errno.in>
 };