X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fcharset.h;h=e900fd789a2b472bc0360601c160b22c88a98fd6;hb=ddd39d0cc1a025a1e2e3c792cc8286dbdfa29b54;hp=b93d0230923b83eca645188a6bdfe423bebfc179;hpb=2fbc804715b7de41e5b378a7f61adc760c7836a1;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/charset.h b/include/charset.h index b93d023..e900fd7 100644 --- a/include/charset.h +++ b/include/charset.h @@ -201,18 +201,6 @@ int u16_strncmp(const u16 *s1, const u16 *s2, size_t n); #define u16_strcmp(s1, s2) u16_strncmp((s1), (s2), SIZE_MAX) /** - * u16_strlen - count non-zero words - * - * This function matches wsclen() if the -fshort-wchar compiler flag is set. - * In the EFI context we explicitly need a function handling u16 strings. - * - * @in: null terminated u16 string - * Return: number of non-zero words. - * This is not the number of utf-16 letters! - */ -size_t u16_strlen(const void *in); - -/** * u16_strsize() - count size of u16 string in bytes including the null * character * @@ -237,6 +225,20 @@ size_t u16_strsize(const void *in); size_t u16_strnlen(const u16 *in, size_t count); /** + * u16_strlen - count non-zero words + * + * This function matches wsclen() if the -fshort-wchar compiler flag is set. + * In the EFI context we explicitly need a function handling u16 strings. + * + * @in: null terminated u16 string + * Return: number of non-zero words. + * This is not the number of utf-16 letters! + */ +size_t u16_strlen(const void *in); + +#define u16_strlen(in) u16_strnlen(in, SIZE_MAX) + +/** * u16_strcpy() - copy u16 string * * Copy u16 string pointed to by src, including terminating null word, to @@ -260,6 +262,20 @@ u16 *u16_strcpy(u16 *dest, const u16 *src); u16 *u16_strdup(const void *src); /** + * u16_strlcat() - Append a length-limited, %NUL-terminated string to another + * + * Append the source string @src to the destination string @dest, overwriting + * null word at the end of @dest adding a terminating null word. + * + * @dest: zero terminated u16 destination string + * @src: zero terminated u16 source string + * @count: size of buffer in u16 words including taling 0x0000 + * Return: required size including trailing 0x0000 in u16 words + * If return value >= count, truncation occurred. + */ +size_t u16_strlcat(u16 *dest, const u16 *src, size_t count); + +/** * utf16_to_utf8() - Convert an utf16 string to utf8 * * Converts 'size' characters of the utf16 string 'src' to utf8