Index: uspace/lib/c/generic/str.c
===================================================================
--- uspace/lib/c/generic/str.c	(revision 980311e2f77982344ba9fdf128d259dd42acc99c)
+++ uspace/lib/c/generic/str.c	(revision 81e20c75433fb4887aa73c34e0befc7c58d0f4e6)
@@ -620,10 +620,7 @@
  * @param size	Size of the destination buffer.
  * @param src	Source wide string.
- *
- * @return EOK, if success, negative otherwise.
- */
-int wstr_to_str(char *dest, size_t size, const wchar_t *src)
-{
-	int rc;
+ */
+void wstr_to_str(char *dest, size_t size, const wchar_t *src)
+{
 	wchar_t ch;
 	size_t src_idx;
@@ -637,11 +634,9 @@
 
 	while ((ch = src[src_idx++]) != 0) {
-		rc = chr_encode(ch, dest, &dest_off, size - 1);
-		if (rc != EOK)
+		if (chr_encode(ch, dest, &dest_off, size - 1) != EOK)
 			break;
 	}
 
 	dest[dest_off] = '\0';
-	return rc;
 }
 
@@ -782,10 +777,7 @@
  * @param dlen	Length of destination buffer (number of wchars).
  * @param src	Source string.
- *
- * @return EOK, if success, negative otherwise.
- */
-int str_to_wstr(wchar_t *dest, size_t dlen, const char *src)
-{
-	int rc=EOK;
+ */
+void str_to_wstr(wchar_t *dest, size_t dlen, const char *src)
+{
 	size_t offset;
 	size_t di;
@@ -798,8 +790,6 @@
 
 	do {
-		if (di >= dlen - 1) {
-			rc = EOVERFLOW;
+		if (di >= dlen - 1)
 			break;
-		}
 
 		c = str_decode(src, &offset, STR_NO_LIMIT);
@@ -808,5 +798,4 @@
 
 	dest[dlen - 1] = '\0';
-	return rc;
 }
 
