From dd80d6309f205cfd4a237730ce03724c6fc36914 Mon Sep 17 00:00:00 2001 From: CosminPerRam Date: Tue, 27 Jun 2023 00:23:19 +0300 Subject: [PATCH] [Protocol] Replace some usage of remaining_length with the more appropiate is_remaining_empty --- src/games/jc2mp.rs | 2 +- src/protocols/gamespy/protocols/three/protocol.rs | 6 +++--- src/protocols/gamespy/protocols/two/protocol.rs | 2 +- src/services/valve_master_server/service.rs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/games/jc2mp.rs b/src/games/jc2mp.rs index f6b4e0c..d941801 100644 --- a/src/games/jc2mp.rs +++ b/src/games/jc2mp.rs @@ -64,7 +64,7 @@ fn parse_players_and_teams(packet: Vec) -> GDResult> { let count = buf.get_u16()?; let mut players = Vec::with_capacity(count as usize); - while buf.remaining_length() > 0 { + while !buf.is_remaining_empty() { players.push(Player { name: buf.get_string_utf8()?, steam_id: buf.get_string_utf8()?, diff --git a/src/protocols/gamespy/protocols/three/protocol.rs b/src/protocols/gamespy/protocols/three/protocol.rs index 567ad92..ae22c01 100644 --- a/src/protocols/gamespy/protocols/three/protocol.rs +++ b/src/protocols/gamespy/protocols/three/protocol.rs @@ -174,7 +174,7 @@ pub(crate) fn data_to_map(packet: &[u8]) -> GDResult<(HashMap, V let mut vars = HashMap::new(); let mut buf = Bufferer::new_with_data(Endianess::Big, packet); - while buf.remaining_length() > 0 { + while !buf.is_remaining_empty() { let key = buf.get_string_utf8()?; if key.is_empty() { break; @@ -214,7 +214,7 @@ fn parse_players_and_teams(packets: Vec>) -> GDResult<(Vec, Vec< for packet in packets { let mut buf = Bufferer::new_with_data(Endianess::Little, &packet); - while buf.remaining_length() > 0 { + while !buf.is_remaining_empty() { if buf.get_u8()? < 3 { continue; } @@ -255,7 +255,7 @@ fn parse_players_and_teams(packets: Vec>) -> GDResult<(Vec, Vec< false => &mut teams_data, }; - while buf.remaining_length() > 0 { + while !buf.is_remaining_empty() { let item = buf.get_string_utf8()?; if item.is_empty() { break; diff --git a/src/protocols/gamespy/protocols/two/protocol.rs b/src/protocols/gamespy/protocols/two/protocol.rs index 5b09d5f..2dd32bc 100644 --- a/src/protocols/gamespy/protocols/two/protocol.rs +++ b/src/protocols/gamespy/protocols/two/protocol.rs @@ -94,7 +94,7 @@ fn get_server_vars(bufferer: &mut Bufferer) -> GDResult> let mut values = HashMap::new(); let mut done_processing_vars = false; - while !done_processing_vars && bufferer.remaining_length() > 0 { + while !done_processing_vars && !bufferer.is_remaining_empty() { let key = bufferer.get_string_utf8()?; let value = bufferer.get_string_utf8_optional()?; diff --git a/src/services/valve_master_server/service.rs b/src/services/valve_master_server/service.rs index 9f73e6d..7beae2a 100644 --- a/src/services/valve_master_server/service.rs +++ b/src/services/valve_master_server/service.rs @@ -70,7 +70,7 @@ impl ValveMasterServer { } let mut ips: Vec<(IpAddr, u16)> = Vec::new(); - while buf.remaining_length() > 0 { + while !buf.is_remaining_empty() { let ip = IpAddr::V4(Ipv4Addr::new( buf.get_u8()?, buf.get_u8()?,