rust/clippy: fix lint: explicit_counter_loop

pull/8251/head
Jason Ish 2 years ago committed by Victor Julien
parent f250b92180
commit 5d62995e26

@ -728,10 +728,9 @@ impl DCERPCState {
match parser::parse_dcerpc_bindack(input) { match parser::parse_dcerpc_bindack(input) {
Ok((leftover_bytes, mut back)) => { Ok((leftover_bytes, mut back)) => {
if let Some(ref mut bind) = self.bind { if let Some(ref mut bind) = self.bind {
let mut uuid_internal_id = 0; for (uuid_internal_id, r) in back.ctxitems.iter().enumerate() {
for r in back.ctxitems.iter() {
for mut uuid in bind.uuid_list.iter_mut() { for mut uuid in bind.uuid_list.iter_mut() {
if uuid.internal_id == uuid_internal_id { if uuid.internal_id == uuid_internal_id as u16 {
uuid.result = r.ack_result; uuid.result = r.ack_result;
if uuid.result != 0 { if uuid.result != 0 {
break; break;
@ -740,7 +739,6 @@ impl DCERPCState {
SCLogDebug!("DCERPC BINDACK accepted UUID: {:?}", uuid); SCLogDebug!("DCERPC BINDACK accepted UUID: {:?}", uuid);
} }
} }
uuid_internal_id += 1;
} }
self.bindack = Some(back); self.bindack = Some(back);
} }

@ -31,7 +31,6 @@
#![allow(clippy::collapsible_else_if)] #![allow(clippy::collapsible_else_if)]
#![allow(clippy::collapsible_if)] #![allow(clippy::collapsible_if)]
#![allow(clippy::derive_partial_eq_without_eq)] #![allow(clippy::derive_partial_eq_without_eq)]
#![allow(clippy::explicit_counter_loop)]
#![allow(clippy::field_reassign_with_default)] #![allow(clippy::field_reassign_with_default)]
#![allow(clippy::manual_find)] #![allow(clippy::manual_find)]
#![allow(clippy::match_like_matches_macro)] #![allow(clippy::match_like_matches_macro)]

@ -347,15 +347,13 @@ fn smb_dcerpc_response_bindack(
}; };
if found { if found {
if let Some(ref mut ifaces) = state.dcerpc_ifaces { if let Some(ref mut ifaces) = state.dcerpc_ifaces {
let mut i = 0; for (i, r) in bindackr.results.into_iter().enumerate() {
for r in bindackr.results {
if i >= ifaces.len() { if i >= ifaces.len() {
// TODO set event: more acks that requests // TODO set event: more acks that requests
break; break;
} }
ifaces[i].ack_result = r.ack_result; ifaces[i].ack_result = r.ack_result;
ifaces[i].acked = true; ifaces[i].acked = true;
i += 1;
} }
} }
} }

@ -599,14 +599,12 @@ pub fn parse_smb2_response_record(i: &[u8]) -> IResult<&[u8], Smb2Record> {
fn smb_basic_search(d: &[u8]) -> usize { fn smb_basic_search(d: &[u8]) -> usize {
let needle = b"SMB"; let needle = b"SMB";
let mut r = 0_usize;
// this could be replaced by aho-corasick // this could be replaced by aho-corasick
let iter = d.windows(needle.len()); let iter = d.windows(needle.len());
for window in iter { for (r, window) in iter.enumerate() {
if window == needle { if window == needle {
return r; return r;
} }
r += 1;
} }
return 0; return 0;
} }

Loading…
Cancel
Save