spacebar/rust-nex
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 50 Wiki Activity Actions

cleaned up code, condensed code and fixed a couple of things

Browse source
This commit is contained in:
DJMrTV 2025-01-26 23:21:35 +01:00
commit 38bcad37bd
10 changed files with 178 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/rmc/structures/string.rs
View file

@ -1,18 +1,30 @@
use std::ffi::CString;
use std::io::{Read, Seek};
use std::io::{Read, Seek, Write};
use bytemuck::bytes_of;
use log::error;
use crate::endianness::{IS_BIG_ENDIAN, ReadExtensions};
use super::Result;
use super::{Result, RmcSerialize};
pub fn read(reader: &mut (impl Read + Seek)) -> Result<String>{
let len: u16 = reader.read_struct(IS_BIG_ENDIAN)?;
let mut data = vec![0; len as usize - 1];
reader.read_exact(&mut data)?;
impl RmcSerialize for String{
fn deserialize(mut reader: &mut dyn Read) -> Result<Self> {
let len: u16 = reader.read_struct(IS_BIG_ENDIAN)?;
let mut data = vec![0; len as usize - 1];
reader.read_exact(&mut data)?;
let null: u8 = reader.read_struct(IS_BIG_ENDIAN)?;
if null != 0{
error!("unable to find null terminator... continuing anyways");
let null: u8 = reader.read_struct(IS_BIG_ENDIAN)?;
if null != 0{
error!("unable to find null terminator... continuing anyways");
}
Ok(String::from_utf8(data)?)
}
fn serialize(&self, writer: &mut dyn Write) -> Result<()> {
let u16_len: u16 = self.len() as u16;
writer.write(bytes_of(&u16_len))?;
Ok(String::from_utf8(data)?)
writer.write(self.as_bytes())?;
writer.write(&[0])?;
Ok(())
}
}