Index: kernel/generic/src/printf/printf_core.c
===================================================================
--- kernel/generic/src/printf/printf_core.c	(revision 82bb9c121efbe640882ffd5dbdc9101eb995d0fa)
+++ kernel/generic/src/printf/printf_core.c	(revision 7ce3cb23f444724ec768a4973b4707c2e29b3d54)
@@ -115,10 +115,10 @@
 }
 
-/** Print UTF-8 string without adding a newline.
- *
- * @param str UTF-8 string to print.
- * @param ps  Write function specification and support data.
- *
- * @return Number of UTF-8 characters printed.
+/** Print string without adding newline.
+ *
+ * @param str	String to print.
+ * @param ps	Write function specification and support data.
+ *
+ * @return Number of characters printed.
  *
  */
@@ -239,14 +239,14 @@
 }
 
-/** Print UTF-8 string.
- *
- * @param str       UTF-8 string to be printed.
+/** Format and print a string.
+ *
+ * @param str       String to be printed.
  * @param width     Width modifier.
  * @param precision Precision modifier.
  * @param flags     Flags that modify the way the string is printed.
  *
- * @return Number of UTF-8 characters printed, negative value on failure.
- */
-static int print_utf8(char *str, int width, unsigned int precision,
+ * @return Number of characters printed, negative value on failure.
+ */
+static int print_str(char *str, int width, unsigned int precision,
 	uint32_t flags, printf_spec_t *ps)
 {
@@ -259,4 +259,5 @@
 		precision = strw;
 
+	/* Left padding */
 	count_t counter = 0;
 	width -= precision;
@@ -268,4 +269,5 @@
 	}
 
+	/* Part of @a str fitting into the alloted space. */
 	int retval;
 	size_t size = str_wsize(str, precision);
@@ -275,4 +277,5 @@
 	counter += retval;
 
+	/* Right padding */
 	while (width-- > 0) {
 		if (printf_putchar(' ', ps) == 1)
@@ -284,14 +287,15 @@
 }
 
-/** Print UTF-32 string.
- *
- * @param str       UTF-32 string to be printed.
- * @param width     Width modifier.
- * @param precision Precision modifier.
- * @param flags     Flags that modify the way the string is printed.
- *
- * @return Number of UTF-32 characters printed, negative value on failure.
- */
-static int print_utf32(wchar_t *wstr, int width, unsigned int precision,
+/** Format and print a wide string.
+ *
+ * @param wstr		Wide string to be printed.
+ * @param width		Width modifier.
+ * @param precision	Precision modifier.
+ * @param flags		Flags that modify the way the string is printed.
+ *
+ * @return		Number of characters printed, negative value
+ *			on failure.
+ */
+static int print_wstr(wchar_t *wstr, int width, unsigned int precision,
 	uint32_t flags, printf_spec_t *ps)
 {
@@ -304,4 +308,5 @@
 		precision = strw;
 
+	/* Left padding */
 	count_t counter = 0;
 	width -= precision;
@@ -313,4 +318,5 @@
 	}
 
+	/* Part of @a wstr fitting into the alloted space. */
 	int retval;
 	size_t size = wstr_wlength(wstr, precision) * sizeof(wchar_t);
@@ -320,4 +326,5 @@
 	counter += retval;
 
+	/* Right padding */
 	while (width-- > 0) {
 		if (printf_putchar(' ', ps) == 1)
@@ -417,7 +424,7 @@
 	}
 	
-	/* Print leading spaces */
+	/* Print leading spaces. */
 	if (number_size > precision) {
-		/* Print the whole number, not only a part */
+		/* Print the whole number, not only a part. */
 		precision = number_size;
 	}
@@ -433,5 +440,5 @@
 	}
 	
-	/* Print sign */
+	/* Print sign. */
 	if (sgn) {
 		if (printf_putchar(sgn, ps) == 1)
@@ -439,5 +446,5 @@
 	}
 	
-	/* Print prefix */
+	/* Print prefix. */
 	if (flags & __PRINTF_FLAG_PREFIX) {
 		switch(base) {
@@ -472,5 +479,5 @@
 	}
 	
-	/* Print leading zeroes */
+	/* Print leading zeroes. */
 	precision -= number_size;
 	while (precision-- > 0) {
@@ -479,10 +486,10 @@
 	}
 	
-	/* Print the number itself */
+	/* Print the number itself. */
 	int retval;
 	if ((retval = printf_putstr(++ptr, ps)) > 0)
 		counter += retval;
 	
-	/* Print tailing spaces */
+	/* Print tailing spaces. */
 	
 	while (width-- > 0) {
@@ -576,10 +583,9 @@
  *         not printed by default.
  *
- * All other characters from fmt except the formatting directives are printed in
+ * All other characters from fmt except the formatting directives are printed
  * verbatim.
  *
- * @param fmt Formatting NULL terminated string (UTF-8 or plain ASCII).
- *
- * @return Number of UTF-8 characters printed, negative value on failure.
+ * @param fmt Format string.
+ * @return Number of characters printed, negative value on failure.
  *
  */
@@ -590,6 +596,6 @@
 	size_t j = 0;  /* Index to the first not printed nonformating character */
 	
-	wchar_t uc;           /* Current UTF-32 character decoded from fmt */
-	count_t counter = 0;  /* Number of UTF-8 characters printed */
+	wchar_t uc;           /* Current character decoded from fmt */
+	count_t counter = 0;  /* Number of characters printed */
 	int retval;           /* Return values from nested functions */
 	
@@ -738,7 +744,7 @@
 			case 's':
 				if (qualifier == PrintfQualifierLong)
-					retval = print_utf32(va_arg(ap, wchar_t *), width, precision, flags, ps);
+					retval = print_wstr(va_arg(ap, wchar_t *), width, precision, flags, ps);
 				else
-					retval = print_utf8(va_arg(ap, char *), width, precision, flags, ps);
+					retval = print_str(va_arg(ap, char *), width, precision, flags, ps);
 				
 				if (retval < 0) {