andrey/osblog
1
0
Fork 0
mirror of https://github.com/sgmarz/osblog.git synced 2024-11-24 02:16:19 +04:00
Code Issues Projects Releases Wiki Activity

use &str instead of String for paths.

Browse Source
This commit is contained in:
Stephen Marz 2020-05-15 12:36:49 -04:00
parent c435371969
commit 8a0c87a103
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
risc_v/src/fs.rs
View File

@ -192,7 +192,7 @@ impl MinixFileSystem {
/// The goal of open is to traverse the path given by path. If we cache the inodes /// The goal of open is to traverse the path given by path. If we cache the inodes
/// in RAM, it might make this much quicker. For now, this doesn't do anything since /// in RAM, it might make this much quicker. For now, this doesn't do anything since
/// we're just testing read based on if we know the Inode we're looking for. /// we're just testing read based on if we know the Inode we're looking for.
pub fn open(bdev: usize, path: &String) -> Result<Inode, FsError> { pub fn open(bdev: usize, path: &str) -> Result<Inode, FsError> {
if let Some(cache) = unsafe { MFS_INODE_CACHE[bdev-1].take() } { if let Some(cache) = unsafe { MFS_INODE_CACHE[bdev-1].take() } {
let ret; let ret;
if let Some(inode) = cache.get(path) { if let Some(inode) = cache.get(path) {

3
risc_v/src/test.rs
View File

@ -5,7 +5,6 @@ use crate::{elf,
fs::MinixFileSystem, fs::MinixFileSystem,
process::{PROCESS_LIST, process::{PROCESS_LIST,
PROCESS_LIST_MUTEX}}; PROCESS_LIST_MUTEX}};
use alloc::string::String;
/// Test block will load raw binaries into memory to execute them. This function /// Test block will load raw binaries into memory to execute them. This function
/// will load ELF files and try to execute them. /// will load ELF files and try to execute them.
@ -15,7 +14,7 @@ pub fn test() {
// This could be better. We should see what our probe gave us, and it if is // This could be better. We should see what our probe gave us, and it if is
// a block device, init the filesystem. // a block device, init the filesystem.
MinixFileSystem::init(BDEV); MinixFileSystem::init(BDEV);
let file_to_read = String::from("/helloworld.elf"); let file_to_read = "/helloworld.elf";
let desc = MinixFileSystem::open(BDEV, &file_to_read).ok(); let desc = MinixFileSystem::open(BDEV, &file_to_read).ok();
if desc.is_none() { if desc.is_none() {
println!("Error reading {}", file_to_read); println!("Error reading {}", file_to_read);