shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-09 09:57:26 +03:00
Code

boot: Fix calls to ResetSystem

Browse Source 
gnu-efi falsely declares a return type for ResetSystem when it should be
void. The spec also says that it never returns, so just assert.
This commit is contained in:
Jan Janssen 2022-06-23 14:48:13 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent e5c09aad37
commit c4ba5fef78
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/boot/efi/boot.c
View File

@ -593,8 +593,8 @@ static EFI_STATUS reboot_into_firmware(void) {
if (EFI_ERROR(err))
return log_error_status_stall(err, L"Error setting OsIndications: %r", err);
err = RT->ResetSystem(EfiResetCold, EFI_SUCCESS, 0, NULL);
return log_error_status_stall(err, L"Error calling ResetSystem: %r", err);
RT->ResetSystem(EfiResetCold, EFI_SUCCESS, 0, NULL);
assert_not_reached();
}
static BOOLEAN menu_run(
@ -1986,7 +1986,8 @@ static EFI_STATUS boot_windows_bitlocker(void) {
EFI_VARIABLE_NON_VOLATILE);
if (EFI_ERROR(err))
return err;
return RT->ResetSystem(EfiResetWarm, EFI_SUCCESS, 0, NULL);
RT->ResetSystem(EfiResetWarm, EFI_SUCCESS, 0, NULL);
assert_not_reached();
}
}