diff --git a/src/main.rs b/src/main.rs index 858c0c1..23434de 100644 --- a/src/main.rs +++ b/src/main.rs @@ -7,7 +7,7 @@ fn main() -> std::io::Result<()> { let args: Vec = env::args().collect(); for arg in &args[1..] { let mut infile = File::open(arg)?; - one::OneJod::from_archive(&mut infile)?.extract()?; + one::OneJodArchive::from_file(&mut infile)?.extract()?; } Ok(()) } diff --git a/src/one/mod.rs b/src/one/mod.rs index 64d6e86..bb29779 100644 --- a/src/one/mod.rs +++ b/src/one/mod.rs @@ -7,14 +7,14 @@ use std::fs::File; use std::io::{Read, Seek, SeekFrom, Write}; use std::str; -pub struct OneJod { +pub struct OneJodArchive { read_handle: R, _header: OneJodHead, entries: Vec, } -impl OneJod { - pub fn from_archive(mut input: R) -> std::io::Result> { +impl OneJodArchive { + pub fn from_file(mut input: R) -> std::io::Result> { let mut magic = [0; 16]; input.read_exact(&mut magic)?; let _unknown1 = input.read_u32::()?; @@ -57,7 +57,7 @@ impl OneJod { entries.push(entry); } - Ok(OneJod { + Ok(OneJodArchive { read_handle: input, _header: head, entries,