From e583de05823c51694cb443d326e7b0ed13cb457e Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Fri, 19 Jun 2015 14:39:44 +0200 Subject: [PATCH] Minor unittest cleanups --- src/host-bit.c | 1 - src/ippair-bit.c | 1 - src/log-droplog.c | 8 -------- 3 files changed, 10 deletions(-) diff --git a/src/host-bit.c b/src/host-bit.c index 7f33f3bca9..6225673f5d 100644 --- a/src/host-bit.c +++ b/src/host-bit.c @@ -480,7 +480,6 @@ static int HostBitTest11 (void) HostFree(h); end: HostCleanup(); - ret = 1; return ret; } diff --git a/src/ippair-bit.c b/src/ippair-bit.c index 014b1d9b26..0cf5c60c67 100644 --- a/src/ippair-bit.c +++ b/src/ippair-bit.c @@ -483,7 +483,6 @@ static int IPPairBitTest11 (void) IPPairFree(h); end: IPPairCleanup(); - ret = 1; return ret; } diff --git a/src/log-droplog.c b/src/log-droplog.c index 877d243754..69b8539fbd 100644 --- a/src/log-droplog.c +++ b/src/log-droplog.c @@ -390,16 +390,12 @@ int LogDropLogTest01() de_ctx->sig_list = SigInit(de_ctx, "drop tcp any any -> any any " "(msg:\"LogDropLog test\"; content:\"GET\"; Classtype:unknown; sid:1;)"); - result = (de_ctx->sig_list != NULL); - SigGroupBuild(de_ctx); DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx); SigMatchSignatures(&th_v, de_ctx, det_ctx, p); if (p->alerts.cnt == 1 && (PACKET_TEST_ACTION(p, ACTION_DROP))) result = (strcmp(p->alerts.alerts[0].s->class_msg, "Unknown are we") == 0); - else - result = 0; if (LogDropCondition(NULL, p) == TRUE) LogDropLogger(NULL, &dlt, p); @@ -458,16 +454,12 @@ int LogDropLogTest02() de_ctx->sig_list = SigInit(de_ctx, "alert udp any any -> any any " "(msg:\"LogDropLog test\"; content:\"GET\"; Classtype:unknown; sid:1;)"); - result = (de_ctx->sig_list != NULL); - SigGroupBuild(de_ctx); DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx); SigMatchSignatures(&th_v, de_ctx, det_ctx, p); if (p->alerts.cnt == 1 && p->alerts.alerts[0].action != ACTION_DROP) result = (strcmp(p->alerts.alerts[0].s->class_msg, "Unknown are we") == 0); - else - result = 0; if (LogDropCondition(NULL, p) == TRUE) LogDropLogger(NULL, &dlt, p);