aboutsummaryrefslogtreecommitdiff
path: root/stand/efi/boot1/boot1.c
diff options
context:
space:
mode:
Diffstat (limited to 'stand/efi/boot1/boot1.c')
-rw-r--r--stand/efi/boot1/boot1.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/stand/efi/boot1/boot1.c b/stand/efi/boot1/boot1.c
index c906b430c0d6..cad43206aa6a 100644
--- a/stand/efi/boot1/boot1.c
+++ b/stand/efi/boot1/boot1.c
@@ -118,7 +118,7 @@ try_boot(const boot_module_t *mod, dev_info_t *dev, void *loaderbuf, size_t load
if ((status = BS->LoadImage(TRUE, IH, efi_devpath_last_node(dev->devpath),
loaderbuf, loadersize, &loaderhandle)) != EFI_SUCCESS) {
printf("Failed to load image provided by %s, size: %zu, (%lu)\n",
- mod->name, loadersize, EFI_ERROR_CODE(status));
+ mod->name, loadersize, DECODE_ERROR(status));
goto errout;
}
@@ -126,7 +126,7 @@ try_boot(const boot_module_t *mod, dev_info_t *dev, void *loaderbuf, size_t load
(void **)&loaded_image);
if (status != EFI_SUCCESS) {
printf("Failed to query LoadedImage provided by %s (%lu)\n",
- mod->name, EFI_ERROR_CODE(status));
+ mod->name, DECODE_ERROR(status));
goto errout;
}
@@ -152,7 +152,7 @@ try_boot(const boot_module_t *mod, dev_info_t *dev, void *loaderbuf, size_t load
if ((status = BS->StartImage(loaderhandle, NULL, NULL)) !=
EFI_SUCCESS) {
printf("Failed to start image provided by %s (%lu)\n",
- mod->name, EFI_ERROR_CODE(status));
+ mod->name, DECODE_ERROR(status));
loaded_image->LoadOptionsSize = 0;
loaded_image->LoadOptions = NULL;
}
@@ -254,7 +254,7 @@ efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE *Xsystab)
&DevicePathGUID, (void **)&imgpath);
if (status != EFI_SUCCESS) {
DPRINTF("Failed to get image DevicePath (%lu)\n",
- EFI_ERROR_CODE(status));
+ DECODE_ERROR(status));
} else {
text = efi_devpath_name(imgpath);
if (text != NULL) {
@@ -296,12 +296,14 @@ efi_exit(EFI_STATUS s)
BS->FreePages(heap, EFI_SIZE_TO_PAGES(heapsize));
BS->Exit(IH, s, 0, NULL);
+ __unreachable();
}
void
exit(int error)
{
efi_exit(errno_to_efi_status(error));
+ __unreachable();
}
/*
@@ -320,6 +322,7 @@ efi_panic(EFI_STATUS s, const char *fmt, ...)
printf("\n");
efi_exit(s);
+ __unreachable();
}
int getchar(void)