From: Philippe Antoine <pantoine@oisf.net>
Date: Mon, 26 Sep 2022 15:06:38 +0000 (+0200)
Subject: src: remove double includes
X-Git-Tag: suricata-7.0.0-rc1~360
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad713246a93f5cd5e54ae8305c97542044a80ef5;p=thirdparty%2Fsuricata.git

src: remove double includes

Keep the unconditional include to be sure it works

git grep '#include "' src/*.c | sort | uniq -c | awk '$1 > 1'
---

diff --git a/src/app-layer-detect-proto.c b/src/app-layer-detect-proto.c
index d66f7e27cb..f9a54510df 100644
--- a/src/app-layer-detect-proto.c
+++ b/src/app-layer-detect-proto.c
@@ -62,7 +62,6 @@
 #include "util-memcmp.h"
 #include "util-spm.h"
 #include "util-debug.h"
-#include "util-validate.h"
 
 #include "runmodes.h"
 
diff --git a/src/app-layer-enip.c b/src/app-layer-enip.c
index 7c5c1bfb18..a46ddb8afb 100644
--- a/src/app-layer-enip.c
+++ b/src/app-layer-enip.c
@@ -48,7 +48,6 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
-#include "util-byte.h"
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "pkt-var.h"
@@ -607,13 +606,8 @@ void RegisterENIPTCPParsers(void)
 
 /* UNITTESTS */
 #ifdef UNITTESTS
-#include "app-layer-parser.h"
-#include "detect-parse.h"
-#include "detect-engine.h"
 #include "flow-util.h"
 #include "stream-tcp.h"
-#include "util-unittest.h"
-#include "util-unittest-helper.h"
 
 static uint8_t listIdentity[] = {/* List ID */    0x63, 0x00,
                                  /* Length */     0x00, 0x00,
diff --git a/src/app-layer.c b/src/app-layer.c
index 17907455d9..60f0ef5ddc 100644
--- a/src/app-layer.c
+++ b/src/app-layer.c
@@ -1178,7 +1178,6 @@ void AppLayerDeSetupCounters()
 
 #ifdef UNITTESTS
 #include "pkt-var.h"
-#include "stream-tcp.h"
 #include "stream-tcp-util.h"
 #include "stream.h"
 #include "util-unittest.h"
diff --git a/src/defrag.c b/src/defrag.c
index e541ee4025..c93fab31ea 100644
--- a/src/defrag.c
+++ b/src/defrag.c
@@ -63,8 +63,6 @@
 #include "util-unittest.h"
 #endif
 
-#include "util-validate.h"
-
 #define DEFAULT_DEFRAG_HASH_SIZE 0xffff
 #define DEFAULT_DEFRAG_POOL_SIZE 0xffff
 
diff --git a/src/detect-base64-data.c b/src/detect-base64-data.c
index b69dcdbb5b..c237e7ac54 100644
--- a/src/detect-base64-data.c
+++ b/src/detect-base64-data.c
@@ -77,8 +77,6 @@ int DetectBase64DataDoMatch(DetectEngineCtx *de_ctx,
 
 #ifdef UNITTESTS
 
-#include "detect-engine.h"
-
 static int g_file_data_buffer_id = 0;
 
 static int DetectBase64DataSetupTest01(void)
diff --git a/src/detect-bytemath.c b/src/detect-bytemath.c
index 6baeda3ebc..b7740575b0 100644
--- a/src/detect-bytemath.c
+++ b/src/detect-bytemath.c
@@ -424,8 +424,6 @@ SigMatch *DetectByteMathRetrieveSMVar(const char *arg, const Signature *s)
 #ifdef UNITTESTS
 #include "detect-engine-alert.h"
 
-#include "app-layer-parser.h"
-
 static int DetectByteMathParseTest01(void)
 {
 
diff --git a/src/detect-csum.c b/src/detect-csum.c
index 825c00d6b4..f65958dccd 100644
--- a/src/detect-csum.c
+++ b/src/detect-csum.c
@@ -997,7 +997,6 @@ static int DetectCsumValidArgsTestParse03(void)
 #undef TEST3
 #undef mystr
 
-#include "detect-engine.h"
 #include "stream-tcp.h"
 
 static int DetectCsumICMPV6Test01(void)
diff --git a/src/detect-dnp3.c b/src/detect-dnp3.c
index 8099fea4c4..4e9029422c 100644
--- a/src/detect-dnp3.c
+++ b/src/detect-dnp3.c
@@ -597,7 +597,6 @@ void DetectDNP3Register(void)
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "app-layer-parser.h"
-#include "detect-engine.h"
 #include "flow-util.h"
 #include "stream-tcp.h"
 
diff --git a/src/detect-filesize.c b/src/detect-filesize.c
index 9f3a41d70e..05caba8568 100644
--- a/src/detect-filesize.c
+++ b/src/detect-filesize.c
@@ -163,7 +163,6 @@ static void DetectFilesizeFree(DetectEngineCtx *de_ctx, void *ptr)
 #include "stream.h"
 #include "stream-tcp-private.h"
 #include "stream-tcp-reassemble.h"
-#include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "app-layer-parser.h"
 
diff --git a/src/detect-flowvar.c b/src/detect-flowvar.c
index c997276bea..751e48ac72 100644
--- a/src/detect-flowvar.c
+++ b/src/detect-flowvar.c
@@ -40,7 +40,6 @@
 #include "util-var-name.h"
 #include "util-debug.h"
 #include "util-print.h"
-#include "util-spm.h"
 
 #define PARSE_REGEX         "(.*),(.*)"
 static DetectParseRegex parse_regex;
diff --git a/src/detect-http-header-common.c b/src/detect-http-header-common.c
index 3a8fe08c05..401a50fcf5 100644
--- a/src/detect-http-header-common.c
+++ b/src/detect-http-header-common.c
@@ -52,8 +52,6 @@
 #include "detect-http-header.h"
 #include "stream-tcp.h"
 
-#include "util-print.h"
-
 #include "detect-http-header-common.h"
 
 void *HttpHeaderThreadDataInit(void *data)
diff --git a/src/detect-http-header-names.c b/src/detect-http-header-names.c
index 717178e948..eb9e4f117c 100644
--- a/src/detect-http-header-names.c
+++ b/src/detect-http-header-names.c
@@ -63,8 +63,6 @@
 #include "detect-http-header.h"
 #include "stream-tcp.h"
 
-#include "util-print.h"
-
 #define KEYWORD_NAME "http.header_names"
 #define KEYWORD_NAME_LEGACY "http_header_names"
 #define KEYWORD_DOC "http-keywords.html#http-header-names"
diff --git a/src/detect-http-protocol.c b/src/detect-http-protocol.c
index 0f32154ddd..162066ebee 100644
--- a/src/detect-http-protocol.c
+++ b/src/detect-http-protocol.c
@@ -63,8 +63,6 @@
 #include "detect-http-header.h"
 #include "stream-tcp.h"
 
-#include "util-print.h"
-
 #define KEYWORD_NAME "http.protocol"
 #define KEYWORD_NAME_LEGACY "http_protocol"
 #define KEYWORD_DOC "http-keywords.html#http-protocol"
diff --git a/src/detect-http-start.c b/src/detect-http-start.c
index 3341d775b1..c13d1fcb09 100644
--- a/src/detect-http-start.c
+++ b/src/detect-http-start.c
@@ -62,8 +62,6 @@
 #include "detect-http-header.h"
 #include "stream-tcp.h"
 
-#include "util-print.h"
-
 #define KEYWORD_NAME "http.start"
 #define KEYWORD_NAME_LEGACY "http_start"
 #define KEYWORD_DOC "http-keywords.html#http-start"
diff --git a/src/detect-mqtt-subscribe-topic.c b/src/detect-mqtt-subscribe-topic.c
index e0793b0144..71e359375a 100644
--- a/src/detect-mqtt-subscribe-topic.c
+++ b/src/detect-mqtt-subscribe-topic.c
@@ -49,7 +49,6 @@
 #include "flow-var.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 #include "util-profiling.h"
diff --git a/src/detect-mqtt-unsubscribe-topic.c b/src/detect-mqtt-unsubscribe-topic.c
index 433e18f0e5..b7f884c08e 100644
--- a/src/detect-mqtt-unsubscribe-topic.c
+++ b/src/detect-mqtt-unsubscribe-topic.c
@@ -49,7 +49,6 @@
 #include "flow-var.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 #include "util-profiling.h"
diff --git a/src/detect-template-rust-buffer.c b/src/detect-template-rust-buffer.c
index 62823a94e8..a3185ddda4 100644
--- a/src/detect-template-rust-buffer.c
+++ b/src/detect-template-rust-buffer.c
@@ -121,9 +121,6 @@ static uint8_t DetectEngineInspectTemplateRustBuffer(DetectEngineCtx *de_ctx,
 
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
-#include "app-layer-parser.h"
-#include "detect-engine.h"
-#include "detect-parse.h"
 #include "flow-util.h"
 #include "stream-tcp.h"
 #include "detect-engine-alert.h"
diff --git a/src/detect-tls-cert-fingerprint.c b/src/detect-tls-cert-fingerprint.c
index d881d9c457..6364696e5e 100644
--- a/src/detect-tls-cert-fingerprint.c
+++ b/src/detect-tls-cert-fingerprint.c
@@ -41,7 +41,6 @@
 #include "flow-var.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 
diff --git a/src/detect-tls-cert-issuer.c b/src/detect-tls-cert-issuer.c
index 72bf4a972e..c39ed95c9d 100644
--- a/src/detect-tls-cert-issuer.c
+++ b/src/detect-tls-cert-issuer.c
@@ -40,7 +40,6 @@
 #include "flow-var.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 
diff --git a/src/detect-tls-cert-serial.c b/src/detect-tls-cert-serial.c
index 4e494ab332..72ba6ad9ef 100644
--- a/src/detect-tls-cert-serial.c
+++ b/src/detect-tls-cert-serial.c
@@ -40,7 +40,6 @@
 #include "flow-var.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 
diff --git a/src/detect-tls-cert-subject.c b/src/detect-tls-cert-subject.c
index 01848518ef..0cb4ee981b 100644
--- a/src/detect-tls-cert-subject.c
+++ b/src/detect-tls-cert-subject.c
@@ -41,7 +41,6 @@
 #include "flow-var.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 
diff --git a/src/detect-tls-certs.c b/src/detect-tls-certs.c
index be2dd7aed0..a9e6a6119b 100644
--- a/src/detect-tls-certs.c
+++ b/src/detect-tls-certs.c
@@ -43,7 +43,6 @@
 #include "flow-var.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 
diff --git a/src/detect-tls-ja3-hash.c b/src/detect-tls-ja3-hash.c
index 3d43193594..625c75f3c6 100644
--- a/src/detect-tls-ja3-hash.c
+++ b/src/detect-tls-ja3-hash.c
@@ -44,7 +44,6 @@
 #include "conf-yaml-loader.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 #include "util-ja3.h"
diff --git a/src/detect-tls-ja3-string.c b/src/detect-tls-ja3-string.c
index 3c660bb711..82b6eb5bcc 100644
--- a/src/detect-tls-ja3-string.c
+++ b/src/detect-tls-ja3-string.c
@@ -44,7 +44,6 @@
 #include "conf-yaml-loader.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 #include "util-ja3.h"
diff --git a/src/detect-tls-ja3s-hash.c b/src/detect-tls-ja3s-hash.c
index 63bec7a06b..38f8efc042 100644
--- a/src/detect-tls-ja3s-hash.c
+++ b/src/detect-tls-ja3s-hash.c
@@ -44,7 +44,6 @@
 #include "conf-yaml-loader.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 #include "util-ja3.h"
diff --git a/src/detect-tls-ja3s-string.c b/src/detect-tls-ja3s-string.c
index d19bef5c51..8e454dde0c 100644
--- a/src/detect-tls-ja3s-string.c
+++ b/src/detect-tls-ja3s-string.c
@@ -44,7 +44,6 @@
 #include "conf-yaml-loader.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 #include "util-ja3.h"
diff --git a/src/detect-tls-sni.c b/src/detect-tls-sni.c
index 2f31390033..eb3f385c56 100644
--- a/src/detect-tls-sni.c
+++ b/src/detect-tls-sni.c
@@ -39,7 +39,6 @@
 #include "flow-var.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 
diff --git a/src/detect-urilen.c b/src/detect-urilen.c
index 6363c6adbb..ba24b966b4 100644
--- a/src/detect-urilen.c
+++ b/src/detect-urilen.c
@@ -235,7 +235,6 @@ bool DetectUrilenValidateContent(const Signature *s, int list, const char **sige
 #include "stream.h"
 #include "stream-tcp-private.h"
 #include "stream-tcp-reassemble.h"
-#include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "app-layer-parser.h"
 #include "detect-engine-alert.h"
diff --git a/src/output-json-alert.c b/src/output-json-alert.c
index 824e7ea680..9f9f8a7771 100644
--- a/src/output-json-alert.c
+++ b/src/output-json-alert.c
@@ -55,7 +55,6 @@
 #include "app-layer-frames.h"
 #include "util-classification-config.h"
 #include "util-syslog.h"
-#include "util-logopenfile.h"
 #include "log-pcap.h"
 
 #include "output.h"
diff --git a/src/output.c b/src/output.c
index a9929f048d..f1d771e6fe 100644
--- a/src/output.c
+++ b/src/output.c
@@ -64,7 +64,6 @@
 #include "output-json-stats.h"
 #include "log-tcp-data.h"
 #include "log-stats.h"
-#include "output-json.h"
 #include "output-json-nfs.h"
 #include "output-json-ftp.h"
 #include "output-json-tftp.h"
diff --git a/src/runmode-netmap.c b/src/runmode-netmap.c
index 85c9d27e7f..5aa4128c88 100644
--- a/src/runmode-netmap.c
+++ b/src/runmode-netmap.c
@@ -43,7 +43,6 @@
 #ifdef HAVE_NETMAP
 #define NETMAP_WITH_LIBS
 #include <net/netmap_user.h>
-#include "util-time.h"
 #endif /* HAVE_NETMAP */
 
 #include "source-netmap.h"
diff --git a/src/source-af-packet.c b/src/source-af-packet.c
index dcdce96501..f2f8f3a5c9 100644
--- a/src/source-af-packet.c
+++ b/src/source-af-packet.c
@@ -73,7 +73,6 @@
 #endif
 
 #ifdef HAVE_PACKET_EBPF
-#include "util-ebpf.h"
 #include <bpf/libbpf.h>
 #include <bpf/bpf.h>
 #endif
diff --git a/src/util-random.c b/src/util-random.c
index 488e90d239..0beee32878 100644
--- a/src/util-random.c
+++ b/src/util-random.c
@@ -61,7 +61,6 @@ static long int RandomGetPosix(void)
 #endif /* !(defined(HAVE_WINCRYPT_H) &&  defined(OS_WIN32)) */
 
 #if defined(HAVE_WINCRYPT_H) && defined(OS_WIN32)
-#include "util-debug.h"
 #include <wincrypt.h>
 
 long int RandomGet(void)