diff options
| author | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2022-10-06 06:48:02 +0200 |
|---|---|---|
| committer | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2022-10-06 22:54:57 +0200 |
| commit | 80fadf4af6413f9668f6cfaea39f7a101103ce9e (patch) | |
| tree | 2f3a1c62b44602f0dea6476381b9ddc921843e57 /cmd | |
| parent | 57b2d300afc987f53fdbccee583f267f17f65654 (diff) | |
| download | u-boot-80fadf4af6413f9668f6cfaea39f7a101103ce9e.zip u-boot-80fadf4af6413f9668f6cfaea39f7a101103ce9e.tar.gz u-boot-80fadf4af6413f9668f6cfaea39f7a101103ce9e.tar.bz2 | |
cmd: simplify do_efi_boot_add()
Use efi_convert_string() to convert a UTF-8 to a UTF-16 string.
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/efidebug.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cmd/efidebug.c b/cmd/efidebug.c index 84e6ff5..25b5c47 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -812,7 +812,6 @@ static int do_efi_boot_add(struct cmd_tbl *cmdtp, int flag, char *endp; u16 var_name16[9]; efi_guid_t guid; - size_t label_len, label_len16; u16 *label; struct efi_device_path *file_path = NULL; struct efi_device_path *fp_free = NULL; @@ -859,13 +858,10 @@ static int do_efi_boot_add(struct cmd_tbl *cmdtp, int flag, "Boot", id); /* label */ - label_len = strlen(argv[2]); - label_len16 = utf8_utf16_strnlen(argv[2], label_len); - label = malloc((label_len16 + 1) * sizeof(u16)); + label = efi_convert_string(argv[2]); if (!label) return CMD_RET_FAILURE; lo.label = label; /* label will be changed below */ - utf8_utf16_strncpy(&label, argv[2], label_len); /* file path */ ret = efi_dp_from_name(argv[3], argv[4], argv[5], |