GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-29 02:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

efi_loader: consistent types in efidebug.c

Browse source 
efi_status_t and int are of different size. Use separate variables for
return codes of different type.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2019-06-20 12:48:04 +02:00
parent ee88eacbdd
commit 428a470a27
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cmd/efidebug.c
View file

@ -505,7 +505,8 @@ static int do_efi_boot_add(cmd_tbl_t *cmdtp, int flag,
struct efi_load_option lo; struct efi_load_option lo;
void *data = NULL; void *data = NULL;
efi_uintn_t size; efi_uintn_t size;
int ret; efi_status_t ret;
int r;
if (argc < 6 || argc > 7) if (argc < 6 || argc > 7)
return CMD_RET_USAGE; return CMD_RET_USAGE;
@ -538,7 +539,7 @@ static int do_efi_boot_add(cmd_tbl_t *cmdtp, int flag,
if (ret != EFI_SUCCESS) { if (ret != EFI_SUCCESS) {
printf("Cannot create device path for \"%s %s\"\n", printf("Cannot create device path for \"%s %s\"\n",
argv[3], argv[4]); argv[3], argv[4]);
ret = CMD_RET_FAILURE; r = CMD_RET_FAILURE;
goto out; goto out;
} }
lo.file_path = file_path; lo.file_path = file_path;
@ -553,7 +554,7 @@ static int do_efi_boot_add(cmd_tbl_t *cmdtp, int flag,
size = efi_serialize_load_option(&lo, (u8 **)&data); size = efi_serialize_load_option(&lo, (u8 **)&data);
if (!size) { if (!size) {
ret = CMD_RET_FAILURE; r = CMD_RET_FAILURE;
goto out; goto out;
} }
@ -562,14 +563,14 @@ static int do_efi_boot_add(cmd_tbl_t *cmdtp, int flag,
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS |
EFI_VARIABLE_RUNTIME_ACCESS, EFI_VARIABLE_RUNTIME_ACCESS,
size, data)); size, data));
ret = (ret == EFI_SUCCESS ? CMD_RET_SUCCESS : CMD_RET_FAILURE); r = (ret == EFI_SUCCESS ? CMD_RET_SUCCESS : CMD_RET_FAILURE);
out: out:
free(data); free(data);
efi_free_pool(device_path); efi_free_pool(device_path);
efi_free_pool(file_path); efi_free_pool(file_path);
free(lo.label); free(lo.label);
return ret; return r;
} }
/** /**
@ -896,6 +897,7 @@ static int do_efi_boot_next(cmd_tbl_t *cmdtp, int flag,
char *endp; char *endp;
efi_guid_t guid; efi_guid_t guid;
efi_status_t ret; efi_status_t ret;
int r;
if (argc != 2) if (argc != 2)
return CMD_RET_USAGE; return CMD_RET_USAGE;
@ -903,7 +905,7 @@ static int do_efi_boot_next(cmd_tbl_t *cmdtp, int flag,
bootnext = (u16)simple_strtoul(argv[1], &endp, 16); bootnext = (u16)simple_strtoul(argv[1], &endp, 16);
if (*endp != '\0' || bootnext > 0xffff) { if (*endp != '\0' || bootnext > 0xffff) {
printf("invalid value: %s\n", argv[1]); printf("invalid value: %s\n", argv[1]);
ret = CMD_RET_FAILURE; r = CMD_RET_FAILURE;
goto out; goto out;
} }
@ -914,9 +916,9 @@ static int do_efi_boot_next(cmd_tbl_t *cmdtp, int flag,
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS |
EFI_VARIABLE_RUNTIME_ACCESS, EFI_VARIABLE_RUNTIME_ACCESS,
size, &bootnext)); size, &bootnext));
ret = (ret == EFI_SUCCESS ? CMD_RET_SUCCESS : CMD_RET_FAILURE); r = (ret == EFI_SUCCESS ? CMD_RET_SUCCESS : CMD_RET_FAILURE);
out: out:
return ret; return r;
} }
/** /**
@ -941,6 +943,7 @@ static int do_efi_boot_order(cmd_tbl_t *cmdtp, int flag,
char *endp; char *endp;
efi_guid_t guid; efi_guid_t guid;
efi_status_t ret; efi_status_t ret;
int r;
if (argc == 1) if (argc == 1)
return show_efi_boot_order(); return show_efi_boot_order();
@ -957,7 +960,7 @@ static int do_efi_boot_order(cmd_tbl_t *cmdtp, int flag,
id = (int)simple_strtoul(argv[i], &endp, 16); id = (int)simple_strtoul(argv[i], &endp, 16);
if (*endp != '\0' || id > 0xffff) { if (*endp != '\0' || id > 0xffff) {
printf("invalid value: %s\n", argv[i]); printf("invalid value: %s\n", argv[i]);
ret = CMD_RET_FAILURE; r = CMD_RET_FAILURE;
goto out; goto out;
} }
@ -970,11 +973,11 @@ static int do_efi_boot_order(cmd_tbl_t *cmdtp, int flag,
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS |
EFI_VARIABLE_RUNTIME_ACCESS, EFI_VARIABLE_RUNTIME_ACCESS,
size, bootorder)); size, bootorder));
ret = (ret == EFI_SUCCESS ? CMD_RET_SUCCESS : CMD_RET_FAILURE); r = (ret == EFI_SUCCESS ? CMD_RET_SUCCESS : CMD_RET_FAILURE);
out: out:
free(bootorder); free(bootorder);
return ret; return r;
} }
static cmd_tbl_t cmd_efidebug_boot_sub[] = { static cmd_tbl_t cmd_efidebug_boot_sub[] = {