[PATCH v2 4/5] efi: Use 16-bit unicode strings

[Heinrich Schuchardt]

On 7/19/21 3:01 AM, Tom Rini wrote:
> On Mon, Jul 19, 2021 at 02:41:46AM +0200, Heinrich Schuchardt wrote:
>> On 7/18/21 10:14 PM, Simon Glass wrote:
>>> At present we use wide characters for unicode but this is not necessary.
>>> Change the code to use the 'u' literal instead. This helps to fix build
>>> warnings for sandbox on rpi.
>>>
>>> Signed-off-by: Simon Glass <sjg at chromium.org>
>>> Suggested-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
>>
>> According to https://en.cppreference.com/w/c/language/string_literal u""
>> literals are supported since C11. In our Makefile we have CSTD_FLAG :=
>> -std=gnu11.
>>
>> Once we have changed all u"" to L"" we can remove -fshort-wchar from our
>> Makefiles.

Sorry, I meant 'change4 all L"" to u""'.

-fshort-wchar interpretes all L"" as 16bit strings.

> [snip]
>>> diff --git a/include/efi_loader.h b/include/efi_loader.h
>>> index b81180cfda8..cad7961942b 100644
>>> --- a/include/efi_loader.h
>>> +++ b/include/efi_loader.h
>>> @@ -924,7 +924,7 @@ efi_status_t efi_capsule_authenticate(const void *capsule,
>>>    				      efi_uintn_t capsule_size,
>>>    				      void **image, efi_uintn_t *image_size);
>>>
>>> -#define EFI_CAPSULE_DIR L"\\EFI\\UpdateCapsule\\"
>>> +#define EFI_CAPSULE_DIR u"\\EFI\\UpdateCapsule\\"
>
> This brings us more, not less, instances of u"" rather than L"".  Should
> we perhaps make a coccinelle "spatch" to update everything globally and
> drop -fshort-wchar ?
>