From: Victor Julien Date: Thu, 14 Jul 2016 10:11:02 +0000 (+0200) Subject: detect: minor cleanup X-Git-Tag: suricata-3.1.2~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=305b1b90fd11b8684dbf85c44da5171abf6c3035;p=thirdparty%2Fsuricata.git detect: minor cleanup --- diff --git a/src/detect.c b/src/detect.c index 4abf58cd66..a507e4716d 100644 --- a/src/detect.c +++ b/src/detect.c @@ -695,18 +695,13 @@ end: static inline void DetectPrefilterMergeSort(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx) -// SigGroupHead *sgh) { SigIntId mpm, nonmpm; det_ctx->match_array_cnt = 0; SigIntId *mpm_ptr = det_ctx->pmq.rule_id_array; SigIntId *nonmpm_ptr = det_ctx->non_mpm_id_array; - //SigIntId *nonmpm_ptr = sgh->non_mpm_id_array; uint32_t m_cnt = det_ctx->pmq.rule_id_array_cnt; - //uint32_t n_cnt = sgh->non_mpm_id_cnt; uint32_t n_cnt = det_ctx->non_mpm_id_cnt; - SCLogDebug("PMQ rule id array count %d", det_ctx->pmq.rule_id_array_cnt); -// SCLogDebug("SGH non-MPM id count %d", sgh->non_mpm_id_cnt); SigIntId *final_ptr; uint32_t final_cnt; SigIntId id; @@ -715,6 +710,8 @@ static inline void DetectPrefilterMergeSort(DetectEngineCtx *de_ctx, Signature **match_array = det_ctx->match_array; Signature *s; + SCLogDebug("PMQ rule id array count %d", det_ctx->pmq.rule_id_array_cnt); + /* Load first values. */ if (likely(m_cnt)) { mpm = *mpm_ptr;