Index: uspace/lib/libc/generic/string.c
===================================================================
--- uspace/lib/libc/generic/string.c	(revision e1ab30f8f158334f3d988bcc8214bbdff1fd3cca)
+++ uspace/lib/libc/generic/string.c	(revision d4a3ee504354879f91b1a434c7ca002c096344d1)
@@ -139,6 +139,6 @@
  *
  * @return EOK if the character was encoded successfully, EOVERFLOW if there
- *	   was not enough space in the output buffer or EINVAL if the character
- *	   code was invalid.
+ *         was not enough space in the output buffer or EINVAL if the character
+ *         code was invalid.
  */
 int chr_encode(const wchar_t ch, char *str, size_t *offset, size_t size)
@@ -244,7 +244,7 @@
  *
  */
-size_t str_lsize(const char *str, count_t max_len)
-{
-	count_t len = 0;
+size_t str_lsize(const char *str, size_t max_len)
+{
+	size_t len = 0;
 	size_t offset = 0;
 	
@@ -272,5 +272,5 @@
  *
  */
-size_t wstr_lsize(const wchar_t *str, count_t max_len)
+size_t wstr_lsize(const wchar_t *str, size_t max_len)
 {
 	return (wstr_nlength(str, max_len * sizeof(wchar_t)) * sizeof(wchar_t));
@@ -284,7 +284,7 @@
  *
  */
-count_t str_length(const char *str)
-{
-	count_t len = 0;
+size_t str_length(const char *str)
+{
+	size_t len = 0;
 	size_t offset = 0;
 	
@@ -302,7 +302,7 @@
  *
  */
-count_t wstr_length(const wchar_t *wstr)
-{
-	count_t len = 0;
+size_t wstr_length(const wchar_t *wstr)
+{
+	size_t len = 0;
 	
 	while (*wstr++ != 0)
@@ -320,7 +320,7 @@
  *
  */
-count_t str_nlength(const char *str, size_t size)
-{
-	count_t len = 0;
+size_t str_nlength(const char *str, size_t size)
+{
+	size_t len = 0;
 	size_t offset = 0;
 	
@@ -339,9 +339,9 @@
  *
  */
-count_t wstr_nlength(const wchar_t *str, size_t size)
-{
-	count_t len = 0;
-	count_t limit = ALIGN_DOWN(size, sizeof(wchar_t));
-	count_t offset = 0;
+size_t wstr_nlength(const wchar_t *str, size_t size)
+{
+	size_t len = 0;
+	size_t limit = ALIGN_DOWN(size, sizeof(wchar_t));
+	size_t offset = 0;
 	
 	while ((offset < limit) && (*str++ != 0)) {
@@ -431,5 +431,5 @@
  *
  */
-int str_lcmp(const char *s1, const char *s2, count_t max_len)
+int str_lcmp(const char *s1, const char *s2, size_t max_len)
 {
 	wchar_t c1 = 0;
@@ -439,5 +439,5 @@
 	size_t off2 = 0;
 	
-	count_t len = 0;
+	size_t len = 0;
 
 	while (true) {
@@ -569,5 +569,5 @@
 	
 	wchar_t ch;
-	count_t src_idx = 0;
+	size_t src_idx = 0;
 	size_t dst_off = 0;
 	
@@ -617,5 +617,5 @@
 	size_t off = 0;
 	size_t last = 0;
-	char *res = NULL;
+	const char *res = NULL;
 	
 	while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
@@ -642,12 +642,12 @@
  *
  */
-bool wstr_linsert(wchar_t *str, wchar_t ch, count_t pos, count_t max_pos)
-{
-	count_t len = wstr_length(str);
+bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos)
+{
+	size_t len = wstr_length(str);
 	
 	if ((pos > len) || (pos + 1 > max_pos))
 		return false;
 	
-	count_t i;
+	size_t i;
 	for (i = len; i + 1 > pos; i--)
 		str[i + 1] = str[i];
@@ -670,12 +670,12 @@
  *
  */
-bool wstr_remove(wchar_t *str, count_t pos)
-{
-	count_t len = wstr_length(str);
+bool wstr_remove(wchar_t *str, size_t pos)
+{
+	size_t len = wstr_length(str);
 	
 	if (pos >= len)
 		return false;
 	
-	count_t i;
+	size_t i;
 	for (i = pos + 1; i <= len; i++)
 		str[i - 1] = str[i];
Index: uspace/lib/libc/include/string.h
===================================================================
--- uspace/lib/libc/include/string.h	(revision e1ab30f8f158334f3d988bcc8214bbdff1fd3cca)
+++ uspace/lib/libc/include/string.h	(revision d4a3ee504354879f91b1a434c7ca002c096344d1)
@@ -40,6 +40,6 @@
 #include <bool.h>
 
-#define U_SPECIAL      '?'
-#define U_BOM          0xfeff
+#define U_SPECIAL  '?'
+#define U_BOM      0xfeff
 
 /** No size limit constant */
@@ -55,12 +55,12 @@
 extern size_t wstr_size(const wchar_t *str);
 
-extern size_t str_lsize(const char *str, count_t max_len);
-extern size_t wstr_lsize(const wchar_t *str, count_t max_len);
+extern size_t str_lsize(const char *str, size_t max_len);
+extern size_t wstr_lsize(const wchar_t *str, size_t max_len);
 
-extern count_t str_length(const char *str);
-extern count_t wstr_length(const wchar_t *wstr);
+extern size_t str_length(const char *str);
+extern size_t wstr_length(const wchar_t *wstr);
 
-extern count_t str_nlength(const char *str, size_t size);
-extern count_t wstr_nlength(const wchar_t *str, size_t size);
+extern size_t str_nlength(const char *str, size_t size);
+extern size_t wstr_nlength(const wchar_t *str, size_t size);
 
 extern bool ascii_check(wchar_t ch);
@@ -68,5 +68,5 @@
 
 extern int str_cmp(const char *s1, const char *s2);
-extern int str_lcmp(const char *s1, const char *s2, count_t max_len);
+extern int str_lcmp(const char *s1, const char *s2, size_t max_len);
 
 extern void str_cpy(char *dest, size_t size, const char *src);
@@ -79,6 +79,6 @@
 extern const char *str_rchr(const char *str, wchar_t ch);
 
-extern bool wstr_linsert(wchar_t *str, wchar_t ch, count_t pos, count_t max_pos);
-extern bool wstr_remove(wchar_t *str, count_t pos);
+extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos);
+extern bool wstr_remove(wchar_t *str, size_t pos);
 
 extern char *str_dup(const char *);