From: Philippe Antoine <contact@catenacyber.fr>
Date: Fri, 24 Sep 2021 13:42:50 +0000 (+0200)
Subject: style: remove latest warnings
X-Git-Tag: suricata-5.0.8~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc9779334ba5db37bd4420400614f9a5e747289b;p=thirdparty%2Fsuricata.git

style: remove latest warnings

about unused variables

(cherry picked from commit cb30772372234b88787676eff865e43ce6793cad)
---

diff --git a/rust/src/filetracker.rs b/rust/src/filetracker.rs
index 2dcb9ce1c8..69a6096dfc 100644
--- a/rust/src/filetracker.rs
+++ b/rust/src/filetracker.rs
@@ -50,7 +50,6 @@ impl FileChunk {
 
 #[derive(Debug)]
 pub struct FileTransferTracker {
-    file_size: u64,
     pub tracked: u64,
     cur_ooo: u64,   // how many bytes do we have queued from ooo chunks
     track_id: u32,
@@ -71,7 +70,6 @@ pub struct FileTransferTracker {
 impl FileTransferTracker {
     pub fn new() -> FileTransferTracker {
         FileTransferTracker {
-            file_size:0,
             tracked:0,
             cur_ooo:0,
             track_id:0,
diff --git a/src/detect-engine-analyzer.c b/src/detect-engine-analyzer.c
index 81c23c3849..105841072a 100644
--- a/src/detect-engine-analyzer.c
+++ b/src/detect-engine-analyzer.c
@@ -1152,9 +1152,10 @@ void EngineAnalysisRules(const DetectEngineCtx *de_ctx,
     if (rule_content == 1) {
          //todo: warning if content is weak, separate warning for pcre + weak content
     }
-    if (rule_flow == 0 && rule_flags == 0
-        && !(s->proto.flags & DETECT_PROTO_ANY) && DetectProtoContainsProto(&s->proto, IPPROTO_TCP)
-        && (rule_content || rule_content_http || rule_pcre || rule_pcre_http || rule_flowbits || rule_flowint)) {
+    if (rule_flow == 0 && rule_flags == 0 && !(s->proto.flags & DETECT_PROTO_ANY) &&
+            DetectProtoContainsProto(&s->proto, IPPROTO_TCP) &&
+            (rule_content || rule_content_http || rule_pcre || rule_pcre_http || rule_flowbits ||
+                    rule_flowint)) {
         rule_warning += 1;
         warn_tcp_no_flow = 1;
     }
@@ -1221,7 +1222,8 @@ void EngineAnalysisRules(const DetectEngineCtx *de_ctx,
         if (rule_ipv6_only) fprintf(rule_engine_analysis_FD, "    Rule is IPv6 only.\n");
         if (rule_ipv4_only) fprintf(rule_engine_analysis_FD, "    Rule is IPv4 only.\n");
         if (packet_buf) fprintf(rule_engine_analysis_FD, "    Rule matches on packets.\n");
-        if (!rule_flow_nostream && stream_buf && (rule_flow || rule_flowbits || rule_flowint || rule_content || rule_pcre)) {
+        if (!rule_flow_nostream && stream_buf &&
+                (rule_flow || rule_flowbits || rule_flowint || rule_content || rule_pcre)) {
             fprintf(rule_engine_analysis_FD, "    Rule matches on reassembled stream.\n");
         }
         for(size_t i = 0; i < ARRAY_SIZE(analyzer_items); i++) {
diff --git a/src/detect-engine-build.c b/src/detect-engine-build.c
index fb3392be94..f039fa65cf 100644
--- a/src/detect-engine-build.c
+++ b/src/detect-engine-build.c
@@ -627,7 +627,6 @@ static json_t *RulesGroupPrintSghStats(const SigGroupHead *sgh,
     uint32_t payload_no_mpm_cnt = 0;
     uint32_t syn_cnt = 0;
 
-    uint32_t mpms_total = 0;
     uint32_t mpms_min = 0;
     uint32_t mpms_max = 0;
 
@@ -736,7 +735,6 @@ static json_t *RulesGroupPrintSghStats(const SigGroupHead *sgh,
             }
 
             uint32_t w = PatternStrength(cd->content, cd->content_len);
-            mpms_total += w;
             if (mpms_min == 0)
                 mpms_min = w;
             if (w < mpms_min)