Skip to content

Commit

Permalink
misc: Remove duplicate function declarations
Browse files Browse the repository at this point in the history
Ticket: #7297
  • Loading branch information
Nancyenos committed Oct 23, 2024
1 parent 30806ce commit 94ef040
Show file tree
Hide file tree
Showing 11 changed files with 4 additions and 23 deletions.
2 changes: 0 additions & 2 deletions src/app-layer-events.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
1 change: 1 addition & 0 deletions src/detect-engine-iponly.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions src/detect-engine-mpm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);

Expand Down
2 changes: 2 additions & 0 deletions src/detect-engine.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/detect-engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion src/detect-http-header.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#define SURICATA_DETECT_HTTP_HEADER_H

void DetectHttpHeaderRegister(void);
void DetectHttpRawHeaderRegister(void);
void DetectHttpRequestHeaderRegister(void);
void DetectHttpResponseHeaderRegister(void);

Expand Down
5 changes: 0 additions & 5 deletions src/detect.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions src/flow-manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include "flow-spare-pool.h"

#include "stream-tcp.h"
#include "stream-tcp-cache.h"

#include "util-device.h"

Expand Down
4 changes: 0 additions & 4 deletions src/stream-tcp.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 */
1 change: 0 additions & 1 deletion src/suricata.h
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ int RunmodeIsUnittests(void);
#else
#define RunmodeIsUnittests() 0
#endif
int SCRunmodeGet(void);

/**
* \brief Get the current run mode.
Expand Down
6 changes: 0 additions & 6 deletions src/util-profiling.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 94ef040

Please sign in to comment.