Index: uspace/lib/c/generic/str.c
===================================================================
--- uspace/lib/c/generic/str.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/c/generic/str.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -196,5 +196,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)
@@ -839,5 +839,5 @@
  *			non-ASCII bytes.
  */
-int spascii_to_str(char *dest, size_t size, const uint8_t *src, size_t n)
+errno_t spascii_to_str(char *dest, size_t size, const uint8_t *src, size_t n)
 {
 	size_t sidx;
@@ -845,6 +845,6 @@
 	size_t dlast;
 	uint8_t byte;
-	int rc;
-	int result;
+	errno_t rc;
+	errno_t result;
 
 	/* There must be space for a null terminator in the buffer. */
@@ -920,9 +920,9 @@
  * @return EOK, if success, an error code otherwise.
  */
-int utf16_to_str(char *dest, size_t size, const uint16_t *src)
+errno_t utf16_to_str(char *dest, size_t size, const uint16_t *src)
 {
 	size_t idx = 0, dest_off = 0;
 	wchar_t ch;
-	int rc = EOK;
+	errno_t rc = EOK;
 
 	/* There must be space for a null terminator in the buffer. */
@@ -963,7 +963,7 @@
  * @return EOK, if success, an error code otherwise.
  */
-int str_to_utf16(uint16_t *dest, size_t dlen, const char *src)
-{
-	int rc = EOK;
+errno_t str_to_utf16(uint16_t *dest, size_t dlen, const char *src)
+{
+	errno_t rc = EOK;
 	size_t offset = 0;
 	size_t idx = 0;
@@ -1539,5 +1539,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)
 {
@@ -1660,5 +1660,5 @@
  *
  */
-int str_uint8_t(const char *nptr, const char **endptr, unsigned int base,
+errno_t str_uint8_t(const char *nptr, const char **endptr, unsigned int base,
     bool strict, uint8_t *result)
 {
@@ -1668,5 +1668,5 @@
 	char *lendptr;
 	uint64_t res;
-	int ret = str_uint(nptr, &lendptr, base, &neg, &res);
+	errno_t ret = str_uint(nptr, &lendptr, base, &neg, &res);
 	
 	if (endptr != NULL)
@@ -1707,5 +1707,5 @@
  *
  */
-int str_uint16_t(const char *nptr, const char **endptr, unsigned int base,
+errno_t str_uint16_t(const char *nptr, const char **endptr, unsigned int base,
     bool strict, uint16_t *result)
 {
@@ -1715,5 +1715,5 @@
 	char *lendptr;
 	uint64_t res;
-	int ret = str_uint(nptr, &lendptr, base, &neg, &res);
+	errno_t ret = str_uint(nptr, &lendptr, base, &neg, &res);
 	
 	if (endptr != NULL)
@@ -1754,5 +1754,5 @@
  *
  */
-int str_uint32_t(const char *nptr, const char **endptr, unsigned int base,
+errno_t str_uint32_t(const char *nptr, const char **endptr, unsigned int base,
     bool strict, uint32_t *result)
 {
@@ -1762,5 +1762,5 @@
 	char *lendptr;
 	uint64_t res;
-	int ret = str_uint(nptr, &lendptr, base, &neg, &res);
+	errno_t ret = str_uint(nptr, &lendptr, base, &neg, &res);
 	
 	if (endptr != NULL)
@@ -1801,5 +1801,5 @@
  *
  */
-int str_uint64_t(const char *nptr, const char **endptr, unsigned int base,
+errno_t str_uint64_t(const char *nptr, const char **endptr, unsigned int base,
     bool strict, uint64_t *result)
 {
@@ -1808,5 +1808,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)
@@ -1840,5 +1840,5 @@
  *
  */
-int str_size_t(const char *nptr, const char **endptr, unsigned int base,
+errno_t str_size_t(const char *nptr, const char **endptr, unsigned int base,
     bool strict, size_t *result)
 {
@@ -1848,5 +1848,5 @@
 	char *lendptr;
 	uint64_t res;
-	int ret = str_uint(nptr, &lendptr, base, &neg, &res);
+	errno_t ret = str_uint(nptr, &lendptr, base, &neg, &res);
 	
 	if (endptr != NULL)