From b506bcb171a0e0c52155465a7355052def234647 Mon Sep 17 00:00:00 2001 From: Nancy Enos Date: Fri, 18 Oct 2024 10:59:42 +0300 Subject: [PATCH] Remove duplicate function declarations Task:7297 --- src/app-layer-events.h | 2 -- src/detect-engine-alert.h | 2 -- src/detect-engine-mpm.h | 3 --- src/detect-engine.h | 1 - src/detect-http-header.h | 1 - src/flow-manager.c | 1 + src/stream-tcp.h | 4 ---- src/suricata.h | 1 - src/util-profiling.h | 7 ------- 9 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/app-layer-events.h b/src/app-layer-events.h index 40bda72abf4d..d66191e1cdd1 100644 --- a/src/app-layer-events.h +++ b/src/app-layer-events.h @@ -74,8 +74,6 @@ static inline int AppLayerDecoderEventsIsEventSet( return 0; } -void AppLayerDecoderEventsResetEvents(AppLayerDecoderEvents *events); -void AppLayerDecoderEventsFreeEvents(AppLayerDecoderEvents **events); int DetectEngineGetEventInfo(const char *event_name, int *event_id, AppLayerEventType *event_type); #endif /* SURICATA_APP_LAYER_EVENTS_H */ diff --git a/src/detect-engine-alert.h b/src/detect-engine-alert.h index 9fcd33996cee..4016878f04b5 100644 --- a/src/detect-engine-alert.h +++ b/src/detect-engine-alert.h @@ -28,8 +28,6 @@ #include "decode.h" #include "detect.h" -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); void PacketAlertFinalize(DetectEngineCtx *, DetectEngineThreadCtx *, Packet *); diff --git a/src/detect-engine-mpm.h b/src/detect-engine-mpm.h index f11b7e231eab..16195414042b 100644 --- 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.h b/src/detect-engine.h index 11d747537f1e..3552f161399e 100644 --- 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 187b82736430..a1c9a1396a4a 100644 --- 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/flow-manager.c b/src/flow-manager.c index ae60849a84bb..05b791ee612e 100644 --- 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 006cbb5aa16e..402cdcfded7d 100644 --- 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 f5cc7ff4b4d6..70393541f6fc 100644 --- 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 094c6de6d209..965f6ec8719f 100644 --- a/src/util-profiling.h +++ b/src/util-profiling.h @@ -318,7 +318,6 @@ void SCProfilingSghUpdateCounter(DetectEngineThreadCtx *det_ctx, const SigGroupH void SCProfilingSghThreadSetup(struct SCProfileSghDetectCtx_ *, DetectEngineThreadCtx *); void SCProfilingSghThreadCleanup(DetectEngineThreadCtx *); -void SCProfilingInit(void); void SCProfilingDestroy(void); void SCProfilingRegisterTests(void); void SCProfilingDump(void); @@ -392,12 +391,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);