From 3dade4b3815db7bfa1baf3fbb4fb332b29aba363 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 10 Feb 2025 13:49:31 +0100 Subject: first type tree read --- src/helper.rs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'src/helper.rs') diff --git a/src/helper.rs b/src/helper.rs index c2b9a92..0b126ad 100644 --- a/src/helper.rs +++ b/src/helper.rs @@ -8,6 +8,8 @@ pub enum Endianness { pub trait ReadExt { fn read_u8(&mut self) -> Result; + fn read_u16(&mut self, e: Endianness) -> Result; + fn read_u16_le(&mut self) -> Result; fn read_u16_be(&mut self) -> Result; fn read_i16(&mut self, e: Endianness) -> Result; fn read_i16_be(&mut self) -> Result; @@ -26,15 +28,26 @@ pub trait ReadExt { } impl ReadExt for T { fn read_u8(&mut self) -> Result { - let mut buf = [0; 2]; + let mut buf = [0; 1]; self.read_exact(&mut buf)?; Ok(buf[0]) } + fn read_u16(&mut self, e: Endianness) -> Result { + match e { + Endianness::Big => self.read_u16_be(), + Endianness::Little => self.read_u16_le(), + } + } fn read_u16_be(&mut self) -> Result { let mut buf = [0; 2]; self.read_exact(&mut buf)?; Ok(u16::from_be_bytes(buf)) } + fn read_u16_le(&mut self) -> Result { + let mut buf = [0; 2]; + self.read_exact(&mut buf)?; + Ok(u16::from_le_bytes(buf)) + } fn read_i16(&mut self, e: Endianness) -> Result { match e { Endianness::Big => self.read_i16_be(), -- cgit v1.2.3-70-g09d2