efi_loader: rename utf16_strlen, utf16_strnlen

[oweals/u-boot.git] / lib / charset.c

diff --git a/lib/charset.c b/lib/charset.c
index cd186a5a5ae6735a75ae88a1188f6d6e4e5851d5..8ff8d59957d6502cf15fd646d4b6a5e32b4b2b69 100644 (file)
--- a/lib/charset.c
+++ b/lib/charset.c
@@ -12,14 +12,14 @@
  * utf8/utf16 conversion mostly lifted from grub
  */
 
-size_t utf16_strlen(const uint16_t *in)
+size_t u16_strlen(const u16 *in)
 {
        size_t i;
        for (i = 0; in[i]; i++);
        return i;
 }
 
-size_t utf16_strnlen(const uint16_t *in, size_t count)
+size_t u16_strnlen(const u16 *in, size_t count)
 {
        size_t i;
        for (i = 0; count-- && in[i]; i++);
@@ -39,7 +39,11 @@ uint16_t *utf16_strcpy(uint16_t *dest, const uint16_t *src)
 uint16_t *utf16_strdup(const uint16_t *s)
 {
        uint16_t *new;
-       if (!s || !(new = malloc((utf16_strlen(s) + 1) * 2)))
+
+       if (!s)
+               return NULL;
+       new = malloc((u16_strlen(s) + 1) * 2);
+       if (!new)
                return NULL;
        utf16_strcpy(new, s);
        return new;