diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-23 22:29:53 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-23 22:29:53 -0400 |
| commit | fe4243870df152f839f88e5aa355f53cfba0a866 (patch) | |
| tree | 6f748cbe5c48597a4075ebea87344c4763736686 /disk | |
| parent | ff8c23e784f57a7098e91a200ed7f5a48612b653 (diff) | |
| parent | f62be16ddb76a32e6315bb9517b49e639726e1fa (diff) | |
| download | u-boot-fe4243870df152f839f88e5aa355f53cfba0a866.zip u-boot-fe4243870df152f839f88e5aa355f53cfba0a866.tar.gz u-boot-fe4243870df152f839f88e5aa355f53cfba0a866.tar.bz2 | |
Merge tag 'efi-2019-10-rc1-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for v2019.10-rc1 (2)
* Implement the EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE event.
* Address errors of type -Werror=address-of-packed-member when building
with GCC9.1
* Fix an error when adding memory add addres 0x00000000.
* Rework some code comments for Sphinx compliance.
Diffstat (limited to 'disk')
| -rw-r--r-- | disk/part_efi.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/disk/part_efi.c b/disk/part_efi.c index 3e02669..359b55a 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -670,9 +670,18 @@ err: return ret; } -static void gpt_convert_efi_name_to_char(char *s, efi_char16_t *es, int n) +/** + * gpt_convert_efi_name_to_char() - convert u16 string to char string + * + * TODO: this conversion only supports ANSI characters + * + * @s: target buffer + * @es: u16 string to be converted + * @n: size of target buffer + */ +static void gpt_convert_efi_name_to_char(char *s, void *es, int n) { - char *ess = (char *)es; + char *ess = es; int i, j; memset(s, '\0', n); |