diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-13 07:13:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-13 07:13:28 -0400 |
| commit | 90176e3be63802bc8630bab651d169993f0f0763 (patch) | |
| tree | e60a40154429aeb1bfcdae87649456ee2683bd4a /include/charset.h | |
| parent | d2d8f73da4b648ad21b1afb481f0bcd035ebe029 (diff) | |
| parent | e2d82f8b2a91fb3fa78345f935a93a6db575effa (diff) | |
Merge tag 'efi-2019-07-rc3' of git://git.denx.de/u-boot-efi
Pull request for UEFI sub-system for v2019.07-rc3
The development target for the UEFI sub-system is EBBR compliance. We have
already implemented some further protocols to enable running the UEFI Shell
and the UEFI SCT test suite.
As some boards are severely memory constrained make some of these extras
customizable.
Provide bug fixes. The most prominent ones let us pass the UEFI SCT memory
allocation tests.
Diffstat (limited to 'include/charset.h')
| -rw-r--r-- | include/charset.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/charset.h b/include/charset.h index 65087f76d1f..4f7ae8fafdf 100644 --- a/include/charset.h +++ b/include/charset.h @@ -46,9 +46,9 @@ int utf8_put(s32 code, char **dst); * * @src: utf-8 string * @count: maximum number of code points to convert - * Return: length in bytes after conversion to utf-16 without the + * Return: length in u16 after conversion to utf-16 without the * trailing \0. If an invalid UTF-8 sequence is hit one - * word will be reserved for a replacement character. + * u16 will be reserved for a replacement character. */ size_t utf8_utf16_strnlen(const char *src, size_t count); @@ -56,8 +56,9 @@ size_t utf8_utf16_strnlen(const char *src, size_t count); * utf8_utf16_strlen() - length of a utf-8 string after conversion to utf-16 * * @src: utf-8 string - * Return: length in bytes after conversion to utf-16 without the - * trailing \0. -1 if the utf-8 string is not valid. + * Return: length in u16 after conversion to utf-16 without the + * trailing \0. If an invalid UTF-8 sequence is hit one + * u16 will be reserved for a replacement character. */ #define utf8_utf16_strlen(a) utf8_utf16_strnlen((a), SIZE_MAX) @@ -127,7 +128,8 @@ size_t utf16_utf8_strnlen(const u16 *src, size_t count); * * @src: utf-16 string * Return: length in bytes after conversion to utf-8 without the - * trailing \0. -1 if the utf-16 string is not valid. + * trailing \0. If an invalid UTF-16 sequence is hit one + * byte will be reserved for a replacement character. */ #define utf16_utf8_strlen(a) utf16_utf8_strnlen((a), SIZE_MAX) |