Indentation clean up

pull/1295/head
Ken Steele 11 years ago committed by Victor Julien
parent 403b5a4645
commit 4bd280f196

@ -779,7 +779,8 @@ end:
} }
static inline void DetectPrefilterMergeSort(DetectEngineCtx *de_ctx, static inline void DetectPrefilterMergeSort(DetectEngineCtx *de_ctx,
DetectEngineThreadCtx *det_ctx, SigGroupHead *sgh) DetectEngineThreadCtx *det_ctx,
SigGroupHead *sgh)
{ {
SigIntId mpm, nonmpm; SigIntId mpm, nonmpm;
det_ctx->match_array_cnt = 0; det_ctx->match_array_cnt = 0;
@ -1507,8 +1508,7 @@ int SigMatchSignatures(ThreadVars *th_v, DetectEngineCtx *de_ctx, DetectEngineTh
} }
/* check for a pattern match of the one pattern in this sig. */ /* check for a pattern match of the one pattern in this sig. */
if (likely(sflags & (SIG_FLAG_MPM_PACKET|SIG_FLAG_MPM_STREAM|SIG_FLAG_MPM_APPLAYER))) if (likely(sflags & (SIG_FLAG_MPM_PACKET|SIG_FLAG_MPM_STREAM|SIG_FLAG_MPM_APPLAYER))) {
{
/* filter out sigs that want pattern matches, but /* filter out sigs that want pattern matches, but
* have no matches */ * have no matches */
if (!(det_ctx->pmq.pattern_id_bitarray[(s->mpm_pattern_id_div_8)] & s->mpm_pattern_id_mod_8)) { if (!(det_ctx->pmq.pattern_id_bitarray[(s->mpm_pattern_id_div_8)] & s->mpm_pattern_id_mod_8)) {
@ -1680,7 +1680,6 @@ int SigMatchSignatures(ThreadVars *th_v, DetectEngineCtx *de_ctx, DetectEngineTh
if (DetectEngineInspectPacketPayload(de_ctx, det_ctx, s, pflow, p) != 1) { if (DetectEngineInspectPacketPayload(de_ctx, det_ctx, s, pflow, p) != 1) {
goto next; goto next;
} }
} else { } else {
if (DetectEngineInspectPacketPayload(de_ctx, det_ctx, s, pflow, p) != 1) if (DetectEngineInspectPacketPayload(de_ctx, det_ctx, s, pflow, p) != 1)
goto next; goto next;

Loading…
Cancel
Save