From: Jason Ish <jason.ish@oisf.net>
Date: Wed, 5 Oct 2022 15:00:04 +0000 (-0600)
Subject: rust: fix clippy lints for clippy::collapsible_else_if
X-Git-Tag: suricata-7.0.0-beta1~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=572505870af3463ed36d629dd48a5bdcd2e88e10;p=thirdparty%2Fsuricata.git

rust: fix clippy lints for clippy::collapsible_else_if
---

diff --git a/rust/src/dcerpc/dcerpc_udp.rs b/rust/src/dcerpc/dcerpc_udp.rs
index 1b5513eeb5..ea82074653 100644
--- a/rust/src/dcerpc/dcerpc_udp.rs
+++ b/rust/src/dcerpc/dcerpc_udp.rs
@@ -312,10 +312,8 @@ pub unsafe extern "C" fn rs_dcerpc_probe_udp(_f: *const core::Flow, direction: u
             if dir != Direction::ToServer {
                 *rdir = Direction::ToServer.into();
             }
-        } else {
-            if dir != Direction::ToClient {
-                *rdir = Direction::ToClient.into();
-            }
+        } else if dir != Direction::ToClient {
+            *rdir = Direction::ToClient.into();
         };
         return ALPROTO_DCERPC;
     }
diff --git a/rust/src/http2/detect.rs b/rust/src/http2/detect.rs
index 58f62d1c65..9a3a6a57a2 100644
--- a/rust/src/http2/detect.rs
+++ b/rust/src/http2/detect.rs
@@ -634,12 +634,10 @@ pub unsafe extern "C" fn rs_http2_tx_get_cookie(
             *buffer_len = value.len() as u32;
             return 1;
         }
-    } else {
-        if let Ok(value) = http2_frames_get_header_value(tx, Direction::ToClient, "set-cookie") {
-            *buffer = value.as_ptr(); //unsafe
-            *buffer_len = value.len() as u32;
-            return 1;
-        }
+    } else if let Ok(value) = http2_frames_get_header_value(tx, Direction::ToClient, "set-cookie") {
+        *buffer = value.as_ptr(); //unsafe
+        *buffer_len = value.len() as u32;
+        return 1;
     }
     return 0;
 }
@@ -717,10 +715,8 @@ fn http2_header_iscookie(direction: Direction, hname: &[u8]) -> bool {
             if s.to_lowercase() == "cookie" {
                 return true;
             }
-        } else {
-            if s.to_lowercase() == "set-cookie" {
-                return true;
-            }
+        } else if s.to_lowercase() == "set-cookie" {
+            return true;
         }
     }
     return false;
diff --git a/rust/src/http2/http2.rs b/rust/src/http2/http2.rs
index c6ce7de683..ffc4ffae9d 100644
--- a/rust/src/http2/http2.rs
+++ b/rust/src/http2/http2.rs
@@ -237,13 +237,11 @@ impl HTTP2Transaction {
                         }
                     }
                 }
-            } else {
-                if !self.file_range.is_null() {
-                    if over {
-                        range::http2_range_close(self, Direction::ToClient, decompressed)
-                    } else {
-                        range::http2_range_append(self.file_range, decompressed)
-                    }
+            } else if !self.file_range.is_null() {
+                if over {
+                    range::http2_range_close(self, Direction::ToClient, decompressed)
+                } else {
+                    range::http2_range_append(self.file_range, decompressed)
                 }
             }
             let (files, flags) = self.files.get(Direction::ToClient);
@@ -348,10 +346,8 @@ impl HTTP2Transaction {
                         if self.state < HTTP2TransactionState::HTTP2StateDataClient {
                             self.state = HTTP2TransactionState::HTTP2StateDataClient;
                         }
-                    } else {
-                        if self.state < HTTP2TransactionState::HTTP2StateDataServer {
-                            self.state = HTTP2TransactionState::HTTP2StateDataServer;
-                        }
+                    } else if self.state < HTTP2TransactionState::HTTP2StateDataServer {
+                        self.state = HTTP2TransactionState::HTTP2StateDataServer;
                     }
                 }
             }
diff --git a/rust/src/quic/parser.rs b/rust/src/quic/parser.rs
index 69d93a7dda..dfd09cb00c 100644
--- a/rust/src/quic/parser.rs
+++ b/rust/src/quic/parser.rs
@@ -357,12 +357,10 @@ impl QuicHeader {
                 } else {
                     return Err(nom7::Err::Error(QuicError::InvalidPacket));
                 }
+            } else if let Ok(length) = u16::try_from(rest.len()) {
+                (rest, length)
             } else {
-                if let Ok(length) = u16::try_from(rest.len()) {
-                    (rest, length)
-                } else {
-                    return Err(nom7::Err::Error(QuicError::InvalidPacket));
-                }
+                return Err(nom7::Err::Error(QuicError::InvalidPacket));
             };
 
             Ok((
diff --git a/rust/src/ssh/ssh.rs b/rust/src/ssh/ssh.rs
index 912a6ba16d..0a36f81666 100644
--- a/rust/src/ssh/ssh.rs
+++ b/rust/src/ssh/ssh.rs
@@ -426,10 +426,8 @@ pub unsafe extern "C" fn rs_ssh_tx_get_alstate_progress(
         if tx.cli_hdr.flags >= SSHConnectionState::SshStateBannerDone {
             return SSHConnectionState::SshStateBannerDone as i32;
         }
-    } else {
-        if tx.srv_hdr.flags >= SSHConnectionState::SshStateBannerDone {
-            return SSHConnectionState::SshStateBannerDone as i32;
-        }
+    } else if tx.srv_hdr.flags >= SSHConnectionState::SshStateBannerDone {
+        return SSHConnectionState::SshStateBannerDone as i32;
     }
 
     return SSHConnectionState::SshStateInProgress as i32;
@@ -508,11 +506,9 @@ pub unsafe extern "C" fn rs_ssh_tx_get_log_condition( tx: *mut std::os::raw::c_v
             return true; 
         }
     }
-    else {
-        if  tx.cli_hdr.flags == SSHConnectionState::SshStateBannerDone && 
-            tx.srv_hdr.flags == SSHConnectionState::SshStateBannerDone {
-            return true;
-        }
+    else if  tx.cli_hdr.flags == SSHConnectionState::SshStateBannerDone && 
+        tx.srv_hdr.flags == SSHConnectionState::SshStateBannerDone {
+        return true;
     }
     return false;
 }