From 4dd01694999f15219718ecd972af1973e740a945 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Sat, 5 Jun 2010 22:30:45 +0200
Subject: [PATCH] Fix detection_filter issue.

---
 src/detect-detection-filter.c |  7 +++++--
 src/detect-detection-filter.h | 30 ------------------------------
 src/util-debug.c              | 10 +++++-----
 3 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/src/detect-detection-filter.c b/src/detect-detection-filter.c
index 6651b02f5b..4e423241bc 100644
--- a/src/detect-detection-filter.c
+++ b/src/detect-detection-filter.c
@@ -37,6 +37,9 @@
 #include "util-unittest.h"
 #include "util-debug.h"
 
+#define TRACK_DST      1
+#define TRACK_SRC      2
+
 /**
  *\brief Regex for parsing our detection_filter options
  */
@@ -135,11 +138,11 @@ DetectThresholdData *DetectDetectionFilterParse (char *rawstr) {
         goto error;
     }
 
-    df = SCMalloc(sizeof(DetectDetectionFilterData));
+    df = SCMalloc(sizeof(DetectThresholdData));
     if (df == NULL)
         goto error;
 
-    memset(df,0,sizeof(DetectDetectionFilterData));
+    memset(df,0,sizeof(DetectThresholdData));
 
     df->type = TYPE_DETECTION;
 
diff --git a/src/detect-detection-filter.h b/src/detect-detection-filter.h
index 6ec68b7366..2c74d4f40f 100644
--- a/src/detect-detection-filter.h
+++ b/src/detect-detection-filter.h
@@ -28,36 +28,6 @@
 #include "decode-ipv4.h"
 #include "decode-tcp.h"
 
-#define TRACK_DST      1
-#define TRACK_SRC      2
-
-/**
- * \typedef DetectDetectionFilterData
- * A typedef for DetectDetectionFilterData_
- *
- */
-typedef struct DetectDetectionFilterData_ {
-    uint8_t track;      /**< Track type: by_src, by_dst */
-    uint32_t count;     /**< Event count */
-    uint32_t seconds;   /**< Event seconds */
-} DetectDetectionFilterData;
-
-/**
- *\typedef DetectDetectionFilterEntry
- * A typedef for DetecDetectionFilterEntry_
- *
- */
-typedef struct DetectDetectionFilterEntry_ {
-    uint8_t track;      /**< Track type: by_src, by_dst */
-    uint32_t seconds;   /**< Event seconds */
-
-    Address addr;       /**< Var used to store dst or src addr */
-
-    uint32_t tv_sec1;   /**< Var for time control */
-    uint32_t current_count; /**< Var for count control */
-} DetectDetectionFilterEntry;
-
-
 /**
  * Registration function for detection_filter: keyword
  */
diff --git a/src/util-debug.c b/src/util-debug.c
index 11ddd45c75..9d7e174901 100644
--- a/src/util-debug.c
+++ b/src/util-debug.c
@@ -476,16 +476,16 @@ SCError SCLogMessage(SCLogLevel log_level, char **msg, const char *file,
  * \retval 1 if debug messages are enabled to be logged
  * \retval 0 if debug messages are not enabled to be logged
  */
-int SCLogDebugEnabled()
+int SCLogDebugEnabled(void)
 {
-#ifndef DEBUG
-    return 0;
-#endif
-
+#ifdef DEBUG
     if (sc_log_global_log_level == SC_LOG_DEBUG)
         return 1;
     else
         return 0;
+#else
+    return 0;
+#endif
 }
 
 /**