diff --git a/src/detect-detection-filter.c b/src/detect-detection-filter.c index 7a93679429..0bc2e6df54 100644 --- a/src/detect-detection-filter.c +++ b/src/detect-detection-filter.c @@ -252,7 +252,7 @@ int DetectDetectionFilterSetup (DetectEngineCtx *de_ctx, Signature *s, char *raw sm->type = DETECT_DETECTION_FILTER; sm->ctx = (void *)df; - SigMatchAppendThreshold(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_THRESHOLD); return 0; diff --git a/src/detect-parse.c b/src/detect-parse.c index 25f16d1b54..fb50c5a5ac 100644 --- a/src/detect-parse.c +++ b/src/detect-parse.c @@ -189,15 +189,6 @@ void SigMatchRemoveSMFromList(Signature *s, SigMatch *sm, int sm_list) return; } -/** \brief Append a sig match to the signatures threshold list - * - * \param s signature - * \param new sigmatch to append - */ -void SigMatchAppendThreshold(Signature *s, SigMatch *new) { - SigMatchAppendSMToList(s, new, DETECT_SM_LIST_THRESHOLD); -} - /** \brief Pull a content 'old' from the pmatch list, append 'new' to amatch list. * Used for replacing contents that have http_cookie, etc modifiers. */ diff --git a/src/detect-parse.h b/src/detect-parse.h index 2b8e63ab94..039526d274 100644 --- a/src/detect-parse.h +++ b/src/detect-parse.h @@ -57,7 +57,6 @@ void SigMatchReplace(Signature *, SigMatch *, SigMatch *); void SigMatchReplaceContent(Signature *, SigMatch *, SigMatch *); void SigMatchReplaceContentToUricontent(Signature *, SigMatch *, SigMatch *); -void SigMatchAppendThreshold(Signature *, SigMatch *); void SigMatchAppendSMToList(Signature *, SigMatch *, int); void SigMatchRemoveSMFromList(Signature *, SigMatch *, int); int SigMatchListSMBelongsTo(Signature *, SigMatch *); diff --git a/src/detect-threshold.c b/src/detect-threshold.c index bce4a08e08..e326259aa9 100644 --- a/src/detect-threshold.c +++ b/src/detect-threshold.c @@ -260,7 +260,7 @@ static int DetectThresholdSetup (DetectEngineCtx *de_ctx, Signature *s, char *ra sm->type = DETECT_THRESHOLD; sm->ctx = (void *)de; - SigMatchAppendThreshold(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_THRESHOLD); return 0; diff --git a/src/util-threshold-config.c b/src/util-threshold-config.c index f39daeb705..f72863924b 100644 --- a/src/util-threshold-config.c +++ b/src/util-threshold-config.c @@ -573,7 +573,7 @@ int SCThresholdConfAddThresholdtype(char *rawstr, DetectEngineCtx *de_ctx) de_ctx->ths_ctx.th_size++; } } - SigMatchAppendThreshold(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_THRESHOLD); s = ns; } @@ -644,7 +644,7 @@ int SCThresholdConfAddThresholdtype(char *rawstr, DetectEngineCtx *de_ctx) de_ctx->ths_ctx.th_size++; } } - SigMatchAppendThreshold(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_THRESHOLD); } s = ns; } @@ -718,7 +718,7 @@ int SCThresholdConfAddThresholdtype(char *rawstr, DetectEngineCtx *de_ctx) } } - SigMatchAppendThreshold(sig, sm); + SigMatchAppendSMToList(sig, sm, DETECT_SM_LIST_THRESHOLD); } }