Minor unittest cleanups

diff --git a/src/host-bit.c b/src/host-bit.c
index 7f33f3bca9ee81fa22f96d3abc19cd0da6fd5325..6225673f5daf16195e31c2f94a19a3bf4937ff6f 100644 (file)
--- 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 014b1d9b26d62b49e6d5b9e0ac852f7f34e08f5c..0cf5c60c67c2982731481727e6da94362bc5f372 100644 (file)
--- 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 877d243754f341948bc4b8632b533295586072c5..69b8539fbdb55d7c692d53096e60f2a635992ce6 100644 (file)
--- 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);