commit 7c5df04c29dc6e2f888cd9d2c5382d5ba31a7022
author Pierre-Clément Tosi <ptosi@google.com> Fri May 12 12:06:44 2023 +0000
committer Pierre-Clément Tosi <ptosi@google.com> Tue May 16 12:46:00 2023 +0000
tree 86f04b04bd402f6c10fc0decf5a9509dd40f84a7
parent 1b04c529d73eb1a00dd23870e90bbd6b072f6bb1

pvmfw: Use fully qualified CStr in cstr!()

Allow the macro to be called from modules that don't import CStr.

Test: TH
Change-Id: Ibfc8d49136fbf71dae075ba6794c380e78513496

pvmfw/src/dice.rs

diff --git a/pvmfw/src/dice.rs b/pvmfw/src/dice.rs
index 4e303ac..0aa1273 100644
--- a/pvmfw/src/dice.rs
+++ b/pvmfw/src/dice.rs
@@ -17,7 +17,6 @@
 use crate::cstr;
 use crate::helpers::flushed_zeroize;
 use core::ffi::c_void;
-use core::ffi::CStr;
 use core::mem::size_of;
 use core::slice;
 

pvmfw/src/helpers.rs

diff --git a/pvmfw/src/helpers.rs b/pvmfw/src/helpers.rs
index c230784..bace8da 100644
--- a/pvmfw/src/helpers.rs
+++ b/pvmfw/src/helpers.rs
@@ -182,6 +182,6 @@
 #[macro_export]
 macro_rules! cstr {
     ($str:literal) => {{
-        CStr::from_bytes_with_nul(concat!($str, "\0").as_bytes()).unwrap()
+        core::ffi::CStr::from_bytes_with_nul(concat!($str, "\0").as_bytes()).unwrap()
     }};
 }