Replaces Image::current with current_image

Author: ultimaweapon

README.md

@@ -202,6 +202,7 @@ Keep in mind that you need to put everything your test needed in the same functi
 - `File::info()` now return `Box<FileInfo>` instead of `Owned<FileInfo>` when success.
 - The second parameter of `Owned::new()` is changed to `Dtor`.
 - `SystemTable::current()` was replaced with `zfi::system_table()`.
+- `Image::current()` was replaced with `zfi::current_image()`.
 
 ## License
 

src/boot.rs

@@ -1,5 +1,7 @@
 use crate::event::Event;
-use crate::{Device, Guid, Image, Pages, Path, Status, TableHeader, IMAGE, PAGE_SIZE};
+use crate::{
+    current_image, Device, Guid, Image, Pages, Path, Status, TableHeader, IMAGE, PAGE_SIZE,
+};
 use alloc::vec::Vec;
 use bitflags::bitflags;
 use core::mem::size_of;
@@ -181,7 +183,7 @@ impl BootServices {
     /// functions that are automatically called by Rust (e.g. when the value is dropped)! Usually
     /// this method will be called right before transfering the control to the OS kernel.
     pub unsafe fn exit_boot_services(&self, map_key: usize) -> Result<(), Status> {
-        let status = (self.exit_boot_services)(Image::current(), map_key);
+        let status = (self.exit_boot_services)(current_image(), map_key);
 
         if status != Status::SUCCESS {
             Err(status)

src/debug.rs

@@ -1,6 +1,6 @@
 use crate::{
-    EfiChar, EfiString, File, FileAttributes, FileCreateError, Image, Owned, Path, PathNode,
-    Status, DEBUG_WRITER,
+    current_image, EfiChar, EfiString, File, FileAttributes, FileCreateError, Owned, Path,
+    PathNode, Status, DEBUG_WRITER,
 };
 use alloc::borrow::ToOwned;
 use alloc::boxed::Box;
@@ -44,7 +44,7 @@ impl DebugFile {
     /// `ext` is a file extension without leading dot.
     pub fn next_to_image(ext: &str) -> Result<Self, DebugFileError> {
         // Get FS on the device where the image is located.
-        let im = Image::current().proto();
+        let im = current_image().proto();
         let fs = match im.device().file_system() {
             Some(v) => v,
             None => return Err(DebugFileError::UnsupportedImageLocation),

src/image.rs

@@ -5,11 +5,6 @@ use core::ptr::null;
 pub struct Image(());
 
 impl Image {
-    pub fn current() -> &'static Self {
-        // SAFETY: This is safe because the only place that write IMAGE is our init function.
-        unsafe { &*IMAGE }
-    }
-
     /// Gets the `EFI_LOADED_IMAGE_PROTOCOL` from this image.
     pub fn proto(&self) -> &LoadedImage {
         static ID: Guid = Guid::new(

src/lib.rs

@@ -81,6 +81,12 @@ pub unsafe fn init(
     }
 }
 
+/// Returns `im` that was passed to [`init()`].
+pub fn current_image() -> &'static Image {
+    // SAFETY: This is safe because the only place that write IMAGE is our init function.
+    unsafe { &*IMAGE }
+}
+
 /// Returns `st` that was passed to [`init()`].
 pub fn system_table() -> &'static SystemTable {
     // SAFETY: This is safe because the only place that write ST is our init function.