fix ArrayString type for context name logging
This commit is contained in:
+1
-1
@@ -772,7 +772,7 @@ impl KernelScheme for ProcScheme {
|
||||
let ctx_name = context.read(token.token()).name;
|
||||
info!(
|
||||
"AwaitingFiletableChange applied: ctx='{}' posix_fds={} upper_fds={}",
|
||||
str::from_utf8(&ctx_name).unwrap_or("?"),
|
||||
ctx_name,
|
||||
posix_count,
|
||||
upper_count
|
||||
);
|
||||
|
||||
+2
-3
@@ -3,7 +3,6 @@
|
||||
use core::num::NonZeroUsize;
|
||||
|
||||
use alloc::{string::{String, ToString}, sync::Arc, vec::Vec};
|
||||
use core::str;
|
||||
use redox_path::RedoxPath;
|
||||
|
||||
use crate::{
|
||||
@@ -80,11 +79,11 @@ pub fn openat(
|
||||
let (context, mut token) = current.token_split();
|
||||
let name = context.name;
|
||||
let pipe = context.get_file(fh, &mut token).ok_or_else(|| {
|
||||
info!("openat: EBADF fh={:#x} ctx='{}'", fh.get(), str::from_utf8(&name).unwrap_or("?"));
|
||||
info!("openat: EBADF fh={:#x} ctx='{}'", fh.get(), name);
|
||||
Error::new(EBADF)
|
||||
})?;
|
||||
let desc = pipe.description.read(token.token());
|
||||
info!("openat: fh={:#x} scheme_id={} number={} path='{}' ctx='{}'", fh.get(), desc.scheme.get(), desc.number, path_buf, str::from_utf8(&name).unwrap_or("?"));
|
||||
info!("openat: fh={:#x} scheme_id={} number={} path='{}' ctx='{}'", fh.get(), desc.scheme.get(), desc.number, path_buf, name);
|
||||
(desc.scheme, desc.number)
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user