The function u16_strlen() can be implemented as call to u16_strnlen().
Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com --- include/charset.h | 26 ++++++++++++++------------ lib/charset.c | 12 ------------ 2 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/include/charset.h b/include/charset.h index b93d023092..38908e08f0 100644 --- a/include/charset.h +++ b/include/charset.h @@ -200,18 +200,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 @@ -236,6 +224,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 * diff --git a/lib/charset.c b/lib/charset.c index f44c58d9d8..91cbe87509 100644 --- a/lib/charset.c +++ b/lib/charset.c @@ -375,18 +375,6 @@ int u16_strncmp(const u16 *s1, const u16 *s2, size_t n) return ret; }
-size_t u16_strlen(const void *in) -{ - const char *pos = in; - size_t ret; - - for (; pos[0] || pos[1]; pos += 2) - ; - ret = pos - (char *)in; - ret >>= 1; - return ret; -} - size_t __efi_runtime u16_strnlen(const u16 *in, size_t count) { size_t i;