Index: kernel/generic/include/str.h
===================================================================
--- kernel/generic/include/str.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/str.h	(revision 04c0fc5aa45ec90f84d2ef0b8b067f698c6f5f0e)
@@ -1,4 +1,6 @@
 /*
  * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2011 Oleg Romanenko
  * All rights reserved.
  *
@@ -36,10 +38,10 @@
 #define KERN_STR_H_
 
+#include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <errno.h>
 
-/**< Common Unicode characters */
+/* Common Unicode characters */
 #define U_SPECIAL      '?'
 
@@ -61,9 +63,9 @@
 #define U_CURSOR       0x2588
 
-/**< No size limit constant */
+/** No size limit constant */
 #define STR_NO_LIMIT  ((size_t) -1)
 
-/**< Maximum size of a string containing cnt characters */
-#define STR_BOUNDS(cnt)  ((cnt) << 2)
+/** Maximum size of a string containing @c length characters */
+#define STR_BOUNDS(length)  ((length) << 2)
 
 extern wchar_t str_decode(const char *str, size_t *offset, size_t sz);
@@ -92,7 +94,4 @@
 extern void wstr_to_str(char *dest, size_t size, const wchar_t *src);
 
-extern char *str_dup(const char *src);
-extern char *str_ndup(const char *src, size_t n);
-
 extern char *str_chr(const char *str, wchar_t ch);
 
@@ -100,5 +99,9 @@
 extern bool wstr_remove(wchar_t *str, size_t pos);
 
-extern errno_t str_uint64_t(const char *, char **, unsigned int, bool, uint64_t *);
+extern char *str_dup(const char *src);
+extern char *str_ndup(const char *src, size_t n);
+
+extern errno_t str_uint64_t(const char *, char **, unsigned int, bool,
+    uint64_t *);
 
 extern void order_suffix(const uint64_t, uint64_t *, char *);