tribufu/rust-gamedig
1
0
Fork 0
mirror of https://github.com/tribufu/rust-gamedig synced 2026-06-01 09:42:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Bufferer] Use struct functions internally too

Browse source
This commit is contained in:
CosminPerRam 2023-03-12 22:53:26 +02:00
parent 568c53f129
commit 7500b09b4d
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/bufferer.rs
View file

@ -31,7 +31,7 @@ impl Bufferer {
} }
let value = self.data[self.position]; let value = self.data[self.position];
self.position += 1; self.move_position_ahead(1);
Ok(value) Ok(value)
} }
@ -45,10 +45,10 @@ impl Bufferer {
Endianess::Big => BigEndian::read_u16(self.remaining_data()), Endianess::Big => BigEndian::read_u16(self.remaining_data()),
}; };
self.position += 2; self.move_position_ahead(2);
Ok(value) Ok(value)
} }
pub fn get_u32(&mut self) -> GDResult<u32> { pub fn get_u32(&mut self) -> GDResult<u32> {
if self.check_size(4) { if self.check_size(4) {
return Err(PacketUnderflow); return Err(PacketUnderflow);
@ -59,7 +59,7 @@ impl Bufferer {
Endianess::Big => BigEndian::read_u32(self.remaining_data()), Endianess::Big => BigEndian::read_u32(self.remaining_data()),
}; };
self.position += 4; self.move_position_ahead(4);
Ok(value) Ok(value)
} }
@ -73,7 +73,7 @@ impl Bufferer {
Endianess::Big => BigEndian::read_f32(self.remaining_data()) Endianess::Big => BigEndian::read_f32(self.remaining_data())
}; };
self.position += 4; self.move_position_ahead(4);
Ok(value) Ok(value)
} }
@ -87,12 +87,12 @@ impl Bufferer {
Endianess::Big => BigEndian::read_u64(self.remaining_data()) Endianess::Big => BigEndian::read_u64(self.remaining_data())
}; };
self.position += 8; self.move_position_ahead(8);
Ok(value) Ok(value)
} }
pub fn get_string_utf8(&mut self) -> GDResult<String> { pub fn get_string_utf8(&mut self) -> GDResult<String> {
let sub_buf = &self.data[self.position..]; let sub_buf = self.remaining_data();
if sub_buf.is_empty() { if sub_buf.is_empty() {
return Err(PacketUnderflow); return Err(PacketUnderflow);
} }
@ -102,12 +102,12 @@ impl Bufferer {
let value = std::str::from_utf8(&sub_buf[..first_null_position]) let value = std::str::from_utf8(&sub_buf[..first_null_position])
.map_err(|_| PacketBad)?.to_string(); .map_err(|_| PacketBad)?.to_string();
self.position += value.len() + 1; self.move_position_ahead(value.len() + 1);
Ok(value) Ok(value)
} }
pub fn get_string_utf8_unended(&mut self) -> GDResult<String> { pub fn get_string_utf8_unended(&mut self) -> GDResult<String> {
let sub_buf = &self.data[self.position..]; let sub_buf = self.remaining_data();
if sub_buf.is_empty() { if sub_buf.is_empty() {
return Err(PacketUnderflow); return Err(PacketUnderflow);
} }
@ -115,12 +115,12 @@ impl Bufferer {
let value = std::str::from_utf8(sub_buf) let value = std::str::from_utf8(sub_buf)
.map_err(|_| PacketBad)?.to_string(); .map_err(|_| PacketBad)?.to_string();
self.position += value.len(); self.move_position_ahead(value.len());
Ok(value) Ok(value)
} }
pub fn get_string_utf16(&mut self) -> GDResult<String> { pub fn get_string_utf16(&mut self) -> GDResult<String> {
let sub_buf = &self.data[self.position..]; let sub_buf = self.remaining_data();
if sub_buf.is_empty() { if sub_buf.is_empty() {
return Err(PacketUnderflow); return Err(PacketUnderflow);
} }
@ -133,10 +133,10 @@ impl Bufferer {
let value = String::from_utf16(&paired_buf).map_err(|_| PacketBad)?; let value = String::from_utf16(&paired_buf).map_err(|_| PacketBad)?;
self.position += value.len() * 2; self.move_position_ahead(value.len() * 2);
Ok(value) Ok(value)
} }
pub fn move_position_ahead(&mut self, by: usize) { pub fn move_position_ahead(&mut self, by: usize) {
self.position += by; self.position += by;
} }
@ -154,11 +154,11 @@ impl Bufferer {
} }
pub fn remaining_data_vec(&self) -> Vec<u8> { pub fn remaining_data_vec(&self) -> Vec<u8> {
self.data[self.position..].to_vec() self.remaining_data().to_vec()
} }
pub fn remaining_length(&self) -> usize { pub fn remaining_length(&self) -> usize {
self.data.len() - self.position self.data_length() - self.position
} }
pub fn as_endianess(&self, endianess: Endianess) -> Self { pub fn as_endianess(&self, endianess: Endianess) -> Self {