rust: fix clippy lints for clippy::needless_bool

pull/8073/head
Jason Ish 3 years ago committed by Victor Julien
parent 3ec435a703
commit 5f7ba03e63

@ -295,11 +295,7 @@ pub unsafe extern "C" fn rs_template_parse_request(
stream_slice: StreamSlice,
_data: *const std::os::raw::c_void
) -> AppLayerResult {
let eof = if AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TS) > 0 {
true
} else {
false
};
let eof = AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TS) > 0;
if eof {
// If needed, handle EOF, or pass it into the parser.
@ -327,11 +323,7 @@ pub unsafe extern "C" fn rs_template_parse_response(
stream_slice: StreamSlice,
_data: *const std::os::raw::c_void
) -> AppLayerResult {
let _eof = if AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TC) > 0 {
true
} else {
false
};
let _eof = AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TC) > 0;
let state = cast_pointer!(state, TemplateState);
if stream_slice.is_gap() {

@ -743,7 +743,7 @@ impl NFSState {
}
// for now assume that stable FILE_SYNC flags means a single chunk
let is_last = if w.stable == 2 { true } else { false };
let is_last = w.stable == 2;
let file_handle = w.handle.value.to_vec();
let file_name = if let Some(name) = self.namemap.get(w.handle.value) {
SCLogDebug!("WRITE name {:?}", name);

@ -42,7 +42,7 @@ impl NFSState {
* is not part of the write record itself so we pass it in here. */
fn write_v4<'b>(&mut self, r: &RpcPacket<'b>, w: &Nfs4RequestWrite<'b>, fh: &'b [u8]) {
// for now assume that stable FILE_SYNC flags means a single chunk
let is_last = if w.stable == 2 { true } else { false };
let is_last = w.stable == 2;
SCLogDebug!("is_last {}", is_last);
let mut fill_bytes = 0;

@ -641,11 +641,7 @@ pub unsafe extern "C" fn rs_pgsql_parse_response(
flow: *const Flow, state: *mut std::os::raw::c_void, pstate: *mut std::os::raw::c_void,
stream_slice: StreamSlice, _data: *const std::os::raw::c_void,
) -> AppLayerResult {
let _eof = if AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TC) > 0 {
true
} else {
false
};
let _eof = AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TC) > 0;
let state_safe: &mut PgsqlState = cast_pointer!(state, PgsqlState);

@ -52,14 +52,8 @@ impl<'a> NbssRecord<'a> {
}
pub fn is_smb(&self) -> bool {
let valid = self.is_valid();
let smb = if self.data.len() >= 4 &&
self.data[1] == b'S' && self.data[2] == b'M' && self.data[3] == b'B' &&
(self.data[0] == b'\xFE' || self.data[0] == b'\xFF' || self.data[0] == b'\xFD')
{
true
} else {
false
};
let smb = self.data.len() >= 4 &&
self.data[1] == b'S' && self.data[2] == b'M' && self.data[3] == b'B' && (self.data[0] == b'\xFE' || self.data[0] == b'\xFF' || self.data[0] == b'\xFD');
valid && smb
}

@ -953,11 +953,7 @@ impl SMBState {
for tx in &mut self.transactions {
let found = match tx.type_data {
Some(SMBTransactionTypeData::NEGOTIATE(ref x)) => {
if x.smb_ver == smb_ver {
true
} else {
false
}
x.smb_ver == smb_ver
},
_ => { false },
};

@ -435,11 +435,7 @@ pub unsafe extern "C" fn rs_telnet_parse_request(
stream_slice: StreamSlice,
_data: *const std::os::raw::c_void
) -> AppLayerResult {
let eof = if AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TS) > 0 {
true
} else {
false
};
let eof = AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TS) > 0;
if eof {
// If needed, handle EOF, or pass it into the parser.
@ -467,11 +463,7 @@ pub unsafe extern "C" fn rs_telnet_parse_response(
stream_slice: StreamSlice,
_data: *const std::os::raw::c_void
) -> AppLayerResult {
let _eof = if AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TC) > 0 {
true
} else {
false
};
let _eof = AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TC) > 0;
let state = cast_pointer!(state, TelnetState);
if stream_slice.is_gap() {

Loading…
Cancel
Save