mpm: remove Cleanup API call

It's unused by all of the implementations.
pull/2310/head
Victor Julien 10 years ago
parent 7c47016913
commit 4c0ab681f2

@ -376,28 +376,6 @@ uint16_t PatternMatchDefaultMatcher(void)
void PacketPatternCleanup(ThreadVars *t, DetectEngineThreadCtx *det_ctx)
{
PmqReset(&det_ctx->pmq);
if (det_ctx->sgh == NULL)
return;
/* content */
if (det_ctx->sgh->mpm_packet_ctx != NULL &&
mpm_table[det_ctx->sgh->mpm_packet_ctx->mpm_type].Cleanup != NULL) {
mpm_table[det_ctx->sgh->mpm_packet_ctx->mpm_type].Cleanup(&det_ctx->mtc);
}
/* uricontent */
if (det_ctx->sgh->mpm_uri_ctx_ts != NULL && mpm_table[det_ctx->sgh->mpm_uri_ctx_ts->mpm_type].Cleanup != NULL) {
mpm_table[det_ctx->sgh->mpm_uri_ctx_ts->mpm_type].Cleanup(&det_ctx->mtcu);
}
/* stream content */
if (det_ctx->sgh->mpm_stream_ctx != NULL &&
mpm_table[det_ctx->sgh->mpm_stream_ctx->mpm_type].Cleanup != NULL) {
mpm_table[det_ctx->sgh->mpm_stream_ctx->mpm_type].Cleanup(&det_ctx->mtcs);
}
return;
}
void PatternMatchDestroy(MpmCtx *mpm_ctx, uint16_t mpm_matcher)

@ -103,7 +103,6 @@ void MpmACBSRegister(void)
mpm_table[MPM_AC_BS].AddPatternNocase = SCACBSAddPatternCI;
mpm_table[MPM_AC_BS].Prepare = SCACBSPreparePatterns;
mpm_table[MPM_AC_BS].Search = SCACBSSearch;
mpm_table[MPM_AC_BS].Cleanup = NULL;
mpm_table[MPM_AC_BS].PrintCtx = SCACBSPrintInfo;
mpm_table[MPM_AC_BS].PrintThreadCtx = SCACBSPrintSearchStats;
mpm_table[MPM_AC_BS].RegisterUnittests = SCACBSRegisterTests;

@ -1500,7 +1500,6 @@ void MpmACTileRegister(void)
mpm_table[MPM_AC_TILE].AddPatternNocase = SCACTileAddPatternCI;
mpm_table[MPM_AC_TILE].Prepare = SCACTilePreparePatterns;
mpm_table[MPM_AC_TILE].Search = SCACTileSearch;
mpm_table[MPM_AC_TILE].Cleanup = NULL;
mpm_table[MPM_AC_TILE].PrintCtx = SCACTilePrintInfo;
mpm_table[MPM_AC_TILE].PrintThreadCtx = SCACTilePrintSearchStats;
mpm_table[MPM_AC_TILE].RegisterUnittests = SCACTileRegisterTests;

@ -1767,7 +1767,6 @@ void MpmACRegister(void)
mpm_table[MPM_AC].AddPatternNocase = SCACAddPatternCI;
mpm_table[MPM_AC].Prepare = SCACPreparePatterns;
mpm_table[MPM_AC].Search = SCACSearch;
mpm_table[MPM_AC].Cleanup = NULL;
mpm_table[MPM_AC].PrintCtx = SCACPrintInfo;
mpm_table[MPM_AC].PrintThreadCtx = SCACPrintSearchStats;
mpm_table[MPM_AC].RegisterUnittests = SCACRegisterTests;
@ -1791,7 +1790,6 @@ void MpmACCudaRegister(void)
mpm_table[MPM_AC_CUDA].AddPatternNocase = SCACAddPatternCI;
mpm_table[MPM_AC_CUDA].Prepare = SCACPreparePatterns;
mpm_table[MPM_AC_CUDA].Search = SCACSearch;
mpm_table[MPM_AC_CUDA].Cleanup = NULL;
mpm_table[MPM_AC_CUDA].PrintCtx = SCACPrintInfo;
mpm_table[MPM_AC_CUDA].PrintThreadCtx = SCACPrintSearchStats;
mpm_table[MPM_AC_CUDA].RegisterUnittests = SCACRegisterTests;

@ -1045,7 +1045,6 @@ void MpmHSRegister(void)
mpm_table[MPM_HS].AddPatternNocase = SCHSAddPatternCI;
mpm_table[MPM_HS].Prepare = SCHSPreparePatterns;
mpm_table[MPM_HS].Search = SCHSSearch;
mpm_table[MPM_HS].Cleanup = NULL;
mpm_table[MPM_HS].PrintCtx = SCHSPrintInfo;
mpm_table[MPM_HS].PrintThreadCtx = SCHSPrintSearchStats;
mpm_table[MPM_HS].RegisterUnittests = SCHSRegisterTests;

@ -179,7 +179,6 @@ typedef struct MpmTableElmt_ {
int (*AddPatternNocase)(struct MpmCtx_ *, uint8_t *, uint16_t, uint16_t, uint16_t, uint32_t, SigIntId, uint8_t);
int (*Prepare)(struct MpmCtx_ *);
uint32_t (*Search)(const struct MpmCtx_ *, struct MpmThreadCtx_ *, PatternMatcherQueue *, const uint8_t *, uint16_t);
void (*Cleanup)(struct MpmThreadCtx_ *);
void (*PrintCtx)(struct MpmCtx_ *);
void (*PrintThreadCtx)(struct MpmThreadCtx_ *);
void (*RegisterUnittests)(void);

Loading…
Cancel
Save