From 0a0f5f5ed41b51afd571b9e62fe21e75a5bf5441 Mon Sep 17 00:00:00 2001 From: Pedro de Oliveira Date: Sat, 22 Apr 2023 19:09:29 +0100 Subject: [PATCH] Remove SeekFrom include. Make the two VOC Signatures const. --- src/voc.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/voc.rs b/src/voc.rs index cb93b6e..a47e2b2 100644 --- a/src/voc.rs +++ b/src/voc.rs @@ -2,7 +2,7 @@ use std::fmt; use std::fs::File; -use std::io::{Read, Seek, SeekFrom, Write}; +use std::io::{Read, Seek, Write}; #[derive(Clone, Copy, Debug)] pub enum Codec { @@ -36,24 +36,25 @@ pub struct VocFile { } impl VocFile { + const SIGNATURE1: &'static str = "Creative Voice File"; + const SIGNATURE2: [u8; 3] = [0x1A, 0x1A, 0x0]; + pub fn from_file(file_name: &str) -> Self { let mut fp = File::open(file_name).unwrap(); // Signature - Creative Voice File let mut signature1_buffer: [u8; 19] = [0; 19]; drop(fp.read(&mut signature1_buffer)); - let signature1_expected = "Creative Voice File"; let signature1 = std::str::from_utf8(&signature1_buffer).unwrap(); - if signature1 != signature1_expected { - panic!("Bad file. Expected \"{}\" got \"{}\"", signature1_expected, signature1); + if signature1 != Self::SIGNATURE1 { + panic!("Bad file. Expected \"{}\" got \"{}\"", Self::SIGNATURE1, signature1); } // Signature - 1A 1A 00 let mut signature2_buffer: [u8; 3] = [0; 3]; drop(fp.read(&mut signature2_buffer)); - let signature2_expected: [u8; 3] = [0x1A, 0x1A, 0x0]; - if signature2_buffer != signature2_expected { - panic!("Bad file. Expected {:02X?} got {:02X?}", signature2_expected, signature2_buffer); + if signature2_buffer != Self::SIGNATURE2 { + panic!("Bad file. Expected {:02X?} got {:02X?}", Self::SIGNATURE2, signature2_buffer); } // Version