Leahnaya/kbinxml-rs
1
0
Fork 0
mirror of https://github.com/mbilker/kbinxml-rs.git synced 2026-09-09 19:15:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

byte_buffer: make null byte trim function available to rest of crate

Browse Source
This commit is contained in:
Matt Bilker
2018-09-04 17:34:09 -04:00
parent 7015374d72
commit 9bf833751e
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/byte_buffer.rs
View File

@@ -10,6 +10,16 @@ use node_types::KbinType;
pub use encoding_type::EncodingType;
pub use error::{KbinError, KbinErrorKind, Result};
/// Remove trailing null bytes, used for the `String` type
pub(crate) fn strip_trailing_null_bytes<'a>(data: &'a [u8]) -> &'a [u8] {
let mut index = data.len() - 1;
let len = data.len();
while index > 0 && index < len && data[index] == 0x00 {
index -= 1;
}
&data[..=index]
}
pub struct ByteBufferRead<'buf> {
cursor: Cursor<&'buf [u8]>,
buffer: &'buf [u8],
@@ -77,14 +87,7 @@ impl<'buf> ByteBufferRead<'buf> {
pub fn read_str(&mut self, encoding: EncodingType) -> Result<String> {
let data = self.buf_read()?;
// Remove trailing null bytes
let mut index = data.len() - 1;
let len = data.len();
while index > 0 && index < len && data[index] == 0x00 {
index -= 1;
}
let data = &data[..=index];
let data = strip_trailing_null_bytes(data);
trace!("read_str => size: {}, data: 0x{:02x?}", data.len(), data);
encoding.decode_bytes(data)