From: Victor Julien <victor@inliniac.net>
Date: Wed, 14 Mar 2012 18:19:02 +0000 (+0100)
Subject: Fix 2 compilation issues.
X-Git-Tag: suricata-1.3beta1~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e581ec7dffab8fbf0c791037e7db5df8e0b58b03;p=thirdparty%2Fsuricata.git

Fix 2 compilation issues.
---

diff --git a/src/detect-tag.c b/src/detect-tag.c
index 0a6048b752..06c72fcc22 100644
--- a/src/detect-tag.c
+++ b/src/detect-tag.c
@@ -110,6 +110,8 @@ error:
 int DetectTagMatch (ThreadVars *t, DetectEngineThreadCtx *det_ctx, Packet *p, Signature *s, SigMatch *m)
 {
     DetectTagData *td = (DetectTagData *) m->ctx;
+    DetectTagDataEntry tde;
+    memset(&tde, 0, sizeof(DetectTagDataEntry));
 
     switch (td->type) {
         case DETECT_TAG_TYPE_HOST:
@@ -117,8 +119,6 @@ int DetectTagMatch (ThreadVars *t, DetectEngineThreadCtx *det_ctx, Packet *p, Si
             BUG_ON(!(td->direction == DETECT_TAG_DIR_SRC || td->direction == DETECT_TAG_DIR_DST));
 #endif
 
-            DetectTagDataEntry tde;
-            memset(&tde, 0, sizeof(DetectTagDataEntry));
             tde.sid = s->id;
             tde.gid = s->gid;
             tde.last_ts = tde.first_ts = p->ts.tv_sec;
@@ -135,8 +135,6 @@ int DetectTagMatch (ThreadVars *t, DetectEngineThreadCtx *det_ctx, Packet *p, Si
         case DETECT_TAG_TYPE_SESSION:
             if (p->flow != NULL) {
                 /* If it already exists it will be updated */
-                DetectTagDataEntry tde;
-                memset(&tde, 0, sizeof(DetectTagDataEntry));
                 tde.sid = s->id;
                 tde.gid = s->gid;
                 tde.last_ts = tde.first_ts = p->ts.tv_usec;
diff --git a/src/host.c b/src/host.c
index 7fbf08d303..2e24c8a31a 100644
--- a/src/host.c
+++ b/src/host.c
@@ -255,8 +255,8 @@ void HostShutdown(void)
     SC_ATOMIC_SUB(host_memuse, host_config.hash_size * sizeof(HostHashRow));
     HostQueueDestroy(&host_spare_q);
 
-    SC_ATOMIC_DESTROY(flow_prune_idx);
-    SC_ATOMIC_DESTROY(flow_memuse);
+    SC_ATOMIC_DESTROY(host_prune_idx);
+    SC_ATOMIC_DESTROY(host_memuse);
     //SC_ATOMIC_DESTROY(flow_flags);
     return;
 }