misc: Remove duplicate function declarations

Ticket: #7297

diff --git a/src/detect-engine-iponly.c b/src/detect-engine-iponly.c
index 0cbd1b296f709e8c0415cc5f9efea976f5ff9d48..8a61b5c2d512ecc418a4aa9c784c7b8a6bb9f2be 100644 (file)
--- a/src/detect-engine-iponly.c
+++ b/src/detect-engine-iponly.c
@@ -47,6 +47,7 @@
 #include "detect-threshold.h"
 #include "util-classification-config.h"
 #include "util-rule-vars.h"
+#include "detect-engine-alert.h"
 
 #include "flow-util.h"
 #include "util-debug.h"

diff --git a/src/detect-engine-mpm.h b/src/detect-engine-mpm.h
index f11b7e231eab8dcb27397b978a686a99a35d5c28..16195414042bda0905b928f307e5e3e3dc3009ae 100644 (file)
--- a/src/detect-engine-mpm.h
+++ b/src/detect-engine-mpm.h
@@ -48,9 +48,6 @@ void PatternMatchThreadDestroy(MpmThreadCtx *mpm_thread_ctx, uint16_t);
 
 int PatternMatchPrepareGroup(DetectEngineCtx *, SigGroupHead *);
 
-TmEcode DetectEngineThreadCtxInit(ThreadVars *, void *, void **);
-TmEcode DetectEngineThreadCtxDeinit(ThreadVars *, void *);
-
 int SignatureHasPacketContent(const Signature *);
 int SignatureHasStreamContent(const Signature *);
 

diff --git a/src/detect-engine.c b/src/detect-engine.c
index 6dec58b8fa2f4662be7ea7a042e49f91b07d18c4..c34c305d4a150c497f0f8dfb4c25077ea62c0db9 100644 (file)
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -63,6 +63,8 @@
 
 #include "detect-engine-loader.h"
 
+#include "detect-engine-alert.h"
+
 #include "util-classification-config.h"
 #include "util-reference-config.h"
 #include "util-threshold-config.h"

diff --git a/src/detect-engine.h b/src/detect-engine.h
index 11d747537f1ee0c099adb2f16f3594cfd87aa2e0..3552f161399e70d945f31ae59a81654cc5e75163 100644 (file)
--- a/src/detect-engine.h
+++ b/src/detect-engine.h
@@ -74,7 +74,6 @@ bool DetectEngineBufferTypeSupportsMultiInstanceGetById(
         const DetectEngineCtx *de_ctx, const int id);
 bool DetectEngineBufferTypeSupportsFramesGetById(const DetectEngineCtx *de_ctx, const int id);
 const char *DetectEngineBufferTypeGetDescriptionById(const DetectEngineCtx *de_ctx, const int id);
-const DetectBufferType *DetectEngineBufferTypeGetById(const DetectEngineCtx *de_ctx, const int id);
 int DetectEngineBufferTypeGetByIdTransforms(
         DetectEngineCtx *de_ctx, const int id, TransformData *transforms, int transform_cnt);
 void DetectEngineBufferRunSetupCallback(const DetectEngineCtx *de_ctx, const int id, Signature *s);

diff --git a/src/detect-http-header.h b/src/detect-http-header.h
index 187b827364309a1294e569871a34c90a789b7388..a1c9a1396a4a337036fd850ce5f763c2961cc1cc 100644 (file)
--- a/src/detect-http-header.h
+++ b/src/detect-http-header.h
@@ -25,7 +25,6 @@
 #define SURICATA_DETECT_HTTP_HEADER_H
 
 void DetectHttpHeaderRegister(void);
-void DetectHttpRawHeaderRegister(void);
 void DetectHttpRequestHeaderRegister(void);
 void DetectHttpResponseHeaderRegister(void);
 

diff --git a/src/detect.h b/src/detect.h
index 9a41669d7f128d29caac621fa0d365d992f4bcbe..fe755b7f0d14e7c7a74647ce2dab80a9a6cc3f6f 100644 (file)
--- a/src/detect.h
+++ b/src/detect.h
@@ -1594,11 +1594,6 @@ void *DetectGetInnerTx(void *tx_ptr, AppProto alproto, AppProto engine_alproto,
 void RuleMatchCandidateTxArrayInit(DetectEngineThreadCtx *det_ctx, uint32_t size);
 void RuleMatchCandidateTxArrayFree(DetectEngineThreadCtx *det_ctx);
 
-void AlertQueueInit(DetectEngineThreadCtx *det_ctx);
-void AlertQueueFree(DetectEngineThreadCtx *det_ctx);
-void AlertQueueAppend(DetectEngineThreadCtx *det_ctx, const Signature *s, Packet *p, uint64_t tx_id,
-        uint8_t alert_flags);
-
 int DetectFlowbitsAnalyze(DetectEngineCtx *de_ctx);
 
 int DetectMetadataHashInit(DetectEngineCtx *de_ctx);

diff --git a/src/flow-manager.c b/src/flow-manager.c
index ae60849a84bbfe50f7d4ae51ee5eacd7bae44b08..05b791ee612e933c5ed53915889b9df1dfa9499a 100644 (file)
--- a/src/flow-manager.c
+++ b/src/flow-manager.c
@@ -41,6 +41,7 @@
 #include "flow-spare-pool.h"
 
 #include "stream-tcp.h"
+#include "stream-tcp-cache.h"
 
 #include "util-device.h"
 

diff --git a/src/stream-tcp.h b/src/stream-tcp.h
index 006cbb5aa16e9275008c2ae5711c0a0ea98d907d..402cdcfded7d96b58aca7fed006c107053ac23e9 100644 (file)
--- a/src/stream-tcp.h
+++ b/src/stream-tcp.h
@@ -121,7 +121,6 @@ int StreamTcpSetMemcap(uint64_t);
 uint64_t StreamTcpGetMemcap(void);
 int StreamTcpCheckMemcap(uint64_t);
 uint64_t StreamTcpMemuseCounter(void);
-uint64_t StreamTcpReassembleMemuseGlobalCounter(void);
 
 int StreamTcpSegmentForEach(const Packet *p, uint8_t flag,
                         StreamSegmentCallback CallbackFunc,
@@ -205,7 +204,4 @@ void StreamTcpUpdateAppLayerProgress(TcpSession *ssn, char direction,
 uint64_t StreamTcpGetUsable(const TcpStream *stream, const bool eof);
 uint64_t StreamDataRightEdge(const TcpStream *stream, const bool eof);
 
-void StreamTcpThreadCacheEnable(void);
-void StreamTcpThreadCacheCleanup(void);
-
 #endif /* SURICATA_STREAM_TCP_H */

diff --git a/src/suricata.h b/src/suricata.h
index f5cc7ff4b4d69cccaccd13036f7ec4f0cd73a0ee..70393541f6fc6ccc52902dc70a9ec6fc259085b5 100644 (file)
--- a/src/suricata.h
+++ b/src/suricata.h
@@ -185,7 +185,6 @@ int RunmodeIsUnittests(void);
 #else
 #define RunmodeIsUnittests() 0
 #endif
-int SCRunmodeGet(void);
 
 /**
  * \brief Get the current run mode.

diff --git a/src/util-profiling.h b/src/util-profiling.h
index 094c6de6d209391dda15ff1f82df07d76d367fbe..468012df60866c74cd6eee1111ccdffabd878128 100644 (file)
--- a/src/util-profiling.h
+++ b/src/util-profiling.h
@@ -392,12 +392,6 @@ typedef struct SCProfileDetectCtx_ {
     pthread_mutex_t data_m;
 } SCProfileDetectCtx;
 
-void SCProfilingRulesGlobalInit(void);
-void SCProfilingRuleDestroyCtx(struct SCProfileDetectCtx_ *);
-void SCProfilingRuleInitCounters(DetectEngineCtx *);
-void SCProfilingRuleUpdateCounter(DetectEngineThreadCtx *, uint16_t, uint64_t, int);
-void SCProfilingRuleThreadSetup(struct SCProfileDetectCtx_ *, DetectEngineThreadCtx *);
-void SCProfilingRuleThreadCleanup(DetectEngineThreadCtx *);
 int SCProfileRuleStart(Packet *p);
 json_t *SCProfileRuleTriggerDump(DetectEngineCtx *de_ctx);
 void SCProfileRuleStartCollection(void);