Index: kernel/generic/src/lib/string.c
===================================================================
--- kernel/generic/src/lib/string.c	(revision f25b2819e52daf39913b5aa2b2aa38a1208832d7)
+++ kernel/generic/src/lib/string.c	(revision 06b785f8cd841eaeec20587b753477850c12723b)
@@ -70,5 +70,4 @@
  *
  * @return	Value of decoded character or '?' on decoding error.
- *
  */
 wchar_t chr_decode(const char *str, size_t *offset, size_t sz)
@@ -247,5 +246,4 @@
  *
  * @return True if character is valid Unicode code point.
- *
  */
 bool unicode_check(const wchar_t ch)
@@ -257,16 +255,17 @@
 }
 
-/** Return number of plain characters in a string.
- *
- * @param str NULL-terminated string.
- *
- * @return Number of characters in @a str.
- *
- */
-size_t strlen(const char *str)
+/** Return number of bytes the string occupies.
+ *
+ * @param str A string.
+ * @return Number of bytes in @a str excluding the null terminator.
+ */
+size_t str_size(const char *str)
 {
 	size_t size;
-	for (size = 0; str[size]; size++);
-	
+
+	size = 0;
+	while (*str++ != '\0')
+		++size;
+
 	return size;
 }
@@ -347,5 +346,4 @@
  *
  * @return 0 if the strings are equal, -1 if first is smaller, 1 if second smaller.
- *
  */
 int strncmp(const char *src, const char *dst, size_t len)
@@ -381,5 +379,4 @@
  * @param dest Destination buffer.
  * @param len  Size of destination buffer.
- *
  */
 void strncpy(char *dest, const char *src, size_t len)