Index: kernel/generic/src/printf/printf_core.c =================================================================== --- kernel/generic/src/printf/printf_core.c (revision 58d5a7e7f52a72c963da8a40b5a38494bd631044) +++ kernel/generic/src/printf/printf_core.c (revision c583970b702217433d88305959ef876e3c1707d0) @@ -83,40 +83,40 @@ static char digits_big[] = "0123456789ABCDEF"; -/** Print one or more UTF-8 characters without adding newline. - * - * @param buf Buffer holding UTF-8 characters with size of +/** Print one or more characters without adding newline. + * + * @param buf Buffer holding characters with size of * at least size bytes. NULL is not allowed! * @param size Size of the buffer in bytes. * @param ps Output method and its data. * - * @return Number of UTF-8 characters printed. - * - */ -static int printf_putnchars_utf8(const char *buf, size_t size, + * @return Number of characters printed. + * + */ +static int printf_putnchars(const char *buf, size_t size, printf_spec_t *ps) { - return ps->write_utf8((void *) buf, size, ps->data); -} - -/** Print one or more UTF-32 characters without adding newline. - * - * @param buf Buffer holding UTF-32 characters with size of + return ps->str_write((void *) buf, size, ps->data); +} + +/** Print one or more wide characters without adding newline. + * + * @param buf Buffer holding wide characters with size of * at least size bytes. NULL is not allowed! * @param size Size of the buffer in bytes. * @param ps Output method and its data. * - * @return Number of UTF-32 characters printed. - * - */ -static int printf_putnchars_utf32(const wchar_t *buf, size_t size, + * @return Number of wide characters printed. + * + */ +static int printf_wputnchars(const wchar_t *buf, size_t size, printf_spec_t *ps) { - return ps->write_utf32((void *) buf, size, ps->data); -} - -/** Print string without adding newline. - * - * @param str String to print. - * @param ps Write function specification and support data. + return ps->wstr_write((void *) buf, size, ps->data); +} + +/** Print string without adding a newline. + * + * @param str String to print. + * @param ps Write function specification and support data. * * @return Number of characters printed. @@ -126,7 +126,7 @@ { if (str == NULL) - return printf_putnchars_utf8(nullstr, str_size(nullstr), ps); - - return ps->write_utf8((void *) str, str_size(str), ps->data); + return printf_putnchars(nullstr, str_size(nullstr), ps); + + return ps->str_write((void *) str, str_size(str), ps->data); } @@ -142,12 +142,12 @@ { if (!ascii_check(ch)) - return ps->write_utf8((void *) &invalch, 1, ps->data); - - return ps->write_utf8(&ch, 1, ps->data); -} - -/** Print one UTF-32 character. - * - * @param c UTF-32 character to be printed. + return ps->str_write((void *) &invalch, 1, ps->data); + + return ps->str_write(&ch, 1, ps->data); +} + +/** Print one wide character. + * + * @param c Wide character to be printed. * @param ps Output method. * @@ -157,8 +157,8 @@ static int printf_putwchar(const wchar_t ch, printf_spec_t *ps) { - if (!unicode_check(ch)) - return ps->write_utf8((void *) &invalch, 1, ps->data); - - return ps->write_utf32(&ch, sizeof(wchar_t), ps->data); + if (!chr_check(ch)) + return ps->str_write((void *) &invalch, 1, ps->data); + + return ps->wstr_write(&ch, sizeof(wchar_t), ps->data); } @@ -201,5 +201,5 @@ } -/** Print one formatted UTF-32 character. +/** Print one formatted wide character. * * @param ch Character to print. @@ -239,5 +239,5 @@ } -/** Format and print a string. +/** Print string. * * @param str String to be printed. @@ -271,6 +271,6 @@ /* Part of @a str fitting into the alloted space. */ int retval; - size_t size = str_wsize(str, precision); - if ((retval = printf_putnchars_utf8(str, size, ps)) < 0) + size_t size = str_lsize(str, precision); + if ((retval = printf_putnchars(str, size, ps)) < 0) return -counter; @@ -287,22 +287,21 @@ } -/** 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, +/** Print wide string. + * + * @param str 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 wide characters printed, negative value on failure. + */ +static int print_wstr(wchar_t *str, int width, unsigned int precision, uint32_t flags, printf_spec_t *ps) { - if (wstr == NULL) + if (str == NULL) return printf_putstr(nullstr, ps); /* Print leading spaces. */ - size_t strw = wstr_length(wstr); + size_t strw = wstr_length(str); if (precision == 0) precision = strw; @@ -320,6 +319,6 @@ /* Part of @a wstr fitting into the alloted space. */ int retval; - size_t size = wstr_wlength(wstr, precision) * sizeof(wchar_t); - if ((retval = printf_putnchars_utf32(wstr, size, ps)) < 0) + size_t size = wstr_lsize(str, precision); + if ((retval = printf_wputnchars(str, size, ps)) < 0) return -counter; @@ -424,7 +423,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; } @@ -440,5 +439,5 @@ } - /* Print sign. */ + /* Print sign */ if (sgn) { if (printf_putchar(sgn, ps) == 1) @@ -446,5 +445,5 @@ } - /* Print prefix. */ + /* Print prefix */ if (flags & __PRINTF_FLAG_PREFIX) { switch(base) { @@ -479,5 +478,5 @@ } - /* Print leading zeroes. */ + /* Print leading zeroes */ precision -= number_size; while (precision-- > 0) { @@ -486,10 +485,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) { @@ -546,6 +545,6 @@ * - "" Signed or unsigned int (default value).@n * - "l" Signed or unsigned long int.@n - * If conversion is "c", the character is wchar_t (UTF-32).@n - * If conversion is "s", the string is wchar_t * (UTF-32).@n + * If conversion is "c", the character is wchar_t (wide character).@n + * If conversion is "s", the string is wchar_t * (wide string).@n * - "ll" Signed or unsigned long long int.@n * @@ -555,13 +554,10 @@ * - c Print single character. The character is expected to be plain * ASCII (e.g. only values 0 .. 127 are valid).@n - * If type is "l", then the character is expected to be UTF-32 + * If type is "l", then the character is expected to be wide character * (e.g. values 0 .. 0x10ffff are valid). * * - s Print zero terminated string. If a NULL value is passed as * value, "(NULL)" is printed instead.@n - * The string is expected to be correctly encoded UTF-8 (or plain - * ASCII, which is a subset of UTF-8).@n - * If type is "l", then the string is expected to be correctly - * encoded UTF-32. + * If type is "l", then the string is expected to be wide string. * * - P, p Print value of a pointer. Void * value is expected and it is @@ -586,5 +582,6 @@ * verbatim. * - * @param fmt Format string. + * @param fmt Format NULL-terminated string. + * * @return Number of characters printed, negative value on failure. * @@ -592,9 +589,8 @@ int printf_core(const char *fmt, printf_spec_t *ps, va_list ap) { - size_t i = 0; /* Index of the currently processed character from fmt */ - size_t nxt = 0; - size_t j = 0; /* Index to the first not printed nonformating character */ - - wchar_t uc; /* Current character decoded from fmt */ + size_t i; /* Index of the currently processed character from fmt */ + size_t nxt = 0; /* Index of the next character from fmt */ + size_t j = 0; /* Index to the first not printed nonformating character */ + count_t counter = 0; /* Number of characters printed */ int retval; /* Return values from nested functions */ @@ -602,13 +598,14 @@ while (true) { i = nxt; - uc = chr_decode(fmt, &nxt, UTF8_NO_LIMIT); - - if (uc == '\0') break; - + wchar_t uc = str_decode(fmt, &nxt, STR_NO_LIMIT); + + if (uc == 0) + break; + /* Control character */ if (uc == '%') { /* Print common characters if any processed */ if (i > j) { - if ((retval = printf_putnchars_utf8(&fmt[j], i - j, ps)) < 0) { + if ((retval = printf_putnchars(&fmt[j], i - j, ps)) < 0) { /* Error */ counter = -counter; @@ -626,5 +623,5 @@ do { i = nxt; - uc = chr_decode(fmt, &nxt, UTF8_NO_LIMIT); + uc = str_decode(fmt, &nxt, STR_NO_LIMIT); switch (uc) { case '#': @@ -654,8 +651,8 @@ width *= 10; width += uc - '0'; - + i = nxt; - uc = chr_decode(fmt, &nxt, UTF8_NO_LIMIT); - if (uc == '\0') + uc = str_decode(fmt, &nxt, STR_NO_LIMIT); + if (uc == 0) break; if (!isdigit(uc)) @@ -665,5 +662,5 @@ /* Get width value from argument list */ i = nxt; - uc = chr_decode(fmt, &nxt, UTF8_NO_LIMIT); + uc = str_decode(fmt, &nxt, STR_NO_LIMIT); width = (int) va_arg(ap, int); if (width < 0) { @@ -678,13 +675,13 @@ if (uc == '.') { i = nxt; - uc = chr_decode(fmt, &nxt, UTF8_NO_LIMIT); + uc = str_decode(fmt, &nxt, STR_NO_LIMIT); if (isdigit(uc)) { while (true) { precision *= 10; precision += uc - '0'; - + i = nxt; - uc = chr_decode(fmt, &nxt, UTF8_NO_LIMIT); - if (uc == '\0') + uc = str_decode(fmt, &nxt, STR_NO_LIMIT); + if (uc == 0) break; if (!isdigit(uc)) @@ -694,5 +691,5 @@ /* Get precision value from the argument list */ i = nxt; - uc = chr_decode(fmt, &nxt, UTF8_NO_LIMIT); + uc = str_decode(fmt, &nxt, STR_NO_LIMIT); precision = (int) va_arg(ap, int); if (precision < 0) { @@ -713,8 +710,8 @@ qualifier = PrintfQualifierShort; i = nxt; - uc = chr_decode(fmt, &nxt, UTF8_NO_LIMIT); + uc = str_decode(fmt, &nxt, STR_NO_LIMIT); if (uc == 'h') { i = nxt; - uc = chr_decode(fmt, &nxt, UTF8_NO_LIMIT); + uc = str_decode(fmt, &nxt, STR_NO_LIMIT); qualifier = PrintfQualifierByte; } @@ -724,8 +721,8 @@ qualifier = PrintfQualifierLong; i = nxt; - uc = chr_decode(fmt, &nxt, UTF8_NO_LIMIT); + uc = str_decode(fmt, &nxt, STR_NO_LIMIT); if (uc == 'l') { i = nxt; - uc = chr_decode(fmt, &nxt, UTF8_NO_LIMIT); + uc = str_decode(fmt, &nxt, STR_NO_LIMIT); qualifier = PrintfQualifierLongLong; } @@ -879,5 +876,5 @@ if (i > j) { - if ((retval = printf_putnchars_utf8(&fmt[j], i - j, ps)) < 0) { + if ((retval = printf_putnchars(&fmt[j], i - j, ps)) < 0) { /* Error */ counter = -counter; Index: kernel/generic/src/printf/vprintf.c =================================================================== --- kernel/generic/src/printf/vprintf.c (revision 58d5a7e7f52a72c963da8a40b5a38494bd631044) +++ kernel/generic/src/printf/vprintf.c (revision c583970b702217433d88305959ef876e3c1707d0) @@ -44,27 +44,29 @@ SPINLOCK_INITIALIZE(printf_lock); /**< vprintf spinlock */ -static int vprintf_write_utf8(const char *str, size_t size, void *data) +static int vprintf_str_write(const char *str, size_t size, void *data) { size_t offset = 0; count_t chars = 0; - + while (offset < size) { - putchar(chr_decode(str, &offset, size)); + putchar(str_decode(str, &offset, size)); chars++; } - + return chars; } -static int vprintf_write_utf32(const wchar_t *str, size_t size, void *data) +static int vprintf_wstr_write(const wchar_t *str, size_t size, void *data) { - index_t index = 0; - - while (index < (size / sizeof(wchar_t))) { - putchar(str[index]); - index++; + size_t offset = 0; + count_t chars = 0; + + while (offset < size) { + putchar(str[chars]); + chars++; + offset += sizeof(wchar_t); } - - return index; + + return chars; } @@ -74,10 +76,10 @@ count_t chars = 0; wchar_t uc; - - while ((uc = chr_decode(str, &offset, UTF8_NO_LIMIT)) != 0) { + + while ((uc = str_decode(str, &offset, STR_NO_LIMIT)) != 0) { putchar(uc); chars++; } - + return chars; } @@ -86,17 +88,17 @@ { printf_spec_t ps = { - vprintf_write_utf8, - vprintf_write_utf32, + vprintf_str_write, + vprintf_wstr_write, NULL }; - + ipl_t ipl = interrupts_disable(); spinlock_lock(&printf_lock); - + int ret = printf_core(fmt, &ps, ap); - + spinlock_unlock(&printf_lock); interrupts_restore(ipl); - + return ret; } Index: kernel/generic/src/printf/vsnprintf.c =================================================================== --- kernel/generic/src/printf/vsnprintf.c (revision 58d5a7e7f52a72c963da8a40b5a38494bd631044) +++ kernel/generic/src/printf/vsnprintf.c (revision c583970b702217433d88305959ef876e3c1707d0) @@ -45,5 +45,5 @@ } vsnprintf_data_t; -/** Write UTF-8 string to given buffer. +/** Write string to given buffer. * * Write at most data->size plain characters including trailing zero. @@ -53,14 +53,14 @@ * but size of the input string. * - * @param str Source UTF-8 string to print. + * @param str Source string to print. * @param size Number of plain characters in str. * @param data Structure describing destination string, counter * of used space and total string size. * - * @return Number of UTF-8 characters to print (not characters actually + * @return Number of characters to print (not characters actually * printed). * */ -static int vsnprintf_write_utf8(const char *str, size_t size, vsnprintf_data_t *data) +static int vsnprintf_str_write(const char *str, size_t size, vsnprintf_data_t *data) { size_t left = data->size - data->len; @@ -86,6 +86,6 @@ while (index < size) { - wchar_t uc = chr_decode(str, &index, size); - + wchar_t uc = str_decode(str, &index, size); + if (chr_encode(uc, data->dst, &data->len, data->size - 1) != EOK) break; @@ -112,5 +112,5 @@ } -/** Write UTF-32 string to given buffer. +/** Write wide string to given buffer. * * Write at most data->size plain characters including trailing zero. @@ -120,14 +120,14 @@ * but size of the input string. * - * @param str Source UTF-32 string to print. + * @param str Source wide string to print. * @param size Number of bytes in str. * @param data Structure describing destination string, counter * of used space and total string size. * - * @return Number of UTF-8 characters to print (not characters actually + * @return Number of wide characters to print (not characters actually * printed). * */ -static int vsnprintf_write_utf32(const wchar_t *str, size_t size, vsnprintf_data_t *data) +static int vsnprintf_wstr_write(const wchar_t *str, size_t size, vsnprintf_data_t *data) { index_t index = 0; @@ -170,6 +170,6 @@ }; printf_spec_t ps = { - (int(*) (const char *, size_t, void *)) vsnprintf_write_utf8, - (int(*) (const wchar_t *, size_t, void *)) vsnprintf_write_utf32, + (int(*) (const char *, size_t, void *)) vsnprintf_str_write, + (int(*) (const wchar_t *, size_t, void *)) vsnprintf_wstr_write, &data };