user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes from PR

Browse source 
- Some comment fixes.
- Make some functions unsafe.
- Make helpers module private.
- Rebase on master
- Update r-efi to v4.2.0

Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>
This commit is contained in:
Ayush Singh 2023-03-28 20:14:33 +05:30 • committed by Ayush Singh
parent 5df24d18b6
commit 7a956441a1
No known key found for this signature in database
GPG key ID: 05CEF5C789E55A74
7 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
library/std/src/sys/uefi/helpers.rs
View file

@ -295,7 +295,9 @@ pub(crate) fn create_event(
}
}
pub(crate) fn close_event(evt: NonNull<crate::ffi::c_void>) -> io::Result<()> {
/// # SAFETY
/// - The supplied event must be valid
pub(crate) unsafe fn close_event(evt: NonNull<crate::ffi::c_void>) -> io::Result<()> {
let boot_services: NonNull<efi::BootServices> =
boot_services().ok_or(BOOT_SERVICES_UNAVAILABLE)?.cast();
let r = unsafe {

6
library/std/src/sys/uefi/mod.rs
View file

@ -47,7 +47,7 @@ pub mod thread_local_key;
#[path = "../unsupported/time.rs"]
pub mod time;
pub(crate) mod helpers;
mod helpers;
#[cfg(test)]
mod tests;
@ -96,7 +96,7 @@ pub(crate) unsafe fn init(argc: isize, argv: *const *const u8, _sigpipe: u8) {
/// - must be called only once during runtime cleanup.
pub unsafe fn cleanup() {
if let Some(exit_boot_service_event) = EXIT_BOOT_SERVICE_EVENT.take() {
let _ = helpers::close_event(exit_boot_service_event);
let _ = unsafe { helpers::close_event(exit_boot_service_event) };
}
}
@ -123,7 +123,7 @@ pub fn decode_error_kind(code: i32) -> crate::io::ErrorKind {
pub fn abort_internal() -> ! {
if let Some(exit_boot_service_event) = EXIT_BOOT_SERVICE_EVENT.take() {
let _ = helpers::close_event(exit_boot_service_event);
let _ = unsafe { helpers::close_event(exit_boot_service_event) };
}
if let (Some(boot_services), Some(handle)) =