From: Victor Julien <victor@inliniac.net>
Date: Tue, 14 Jan 2014 09:47:18 +0000 (+0100)
Subject: alert-debuglog: minor cleanups
X-Git-Tag: suricata-2.0rc1~138
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=73377048fd29e01fbfcce39b387f3cb3e22faa2b;p=thirdparty%2Fsuricata.git

alert-debuglog: minor cleanups

Clean up log functions after packet logger conversion. No more
PacketQueue arguments.
---

diff --git a/src/alert-debuglog.c b/src/alert-debuglog.c
index 78f4eed01e..e66bb336d2 100644
--- a/src/alert-debuglog.c
+++ b/src/alert-debuglog.c
@@ -160,11 +160,9 @@ static int AlertDebugPrintStreamSegmentCallback(const Packet *p, void *data, uin
     return 1;
 }
 
-
-
-static TmEcode AlertDebugLogger(ThreadVars *tv, const Packet *p, void *data, PacketQueue *pq, PacketQueue *postpq)
+static TmEcode AlertDebugLogger(ThreadVars *tv, const Packet *p, void *thread_data)
 {
-    AlertDebugLogThread *aft = (AlertDebugLogThread *)data;
+    AlertDebugLogThread *aft = (AlertDebugLogThread *)thread_data;
     int i;
     char timebuf[64];
     const char *pkt_src_str = NULL;
@@ -329,9 +327,9 @@ static TmEcode AlertDebugLogger(ThreadVars *tv, const Packet *p, void *data, Pac
     return TM_ECODE_OK;
 }
 
-static TmEcode AlertDebugLogDecoderEvent(ThreadVars *tv, const Packet *p, void *data, PacketQueue *pq, PacketQueue *postpq)
+static TmEcode AlertDebugLogDecoderEvent(ThreadVars *tv, const Packet *p, void *thread_data)
 {
-    AlertDebugLogThread *aft = (AlertDebugLogThread *)data;
+    AlertDebugLogThread *aft = (AlertDebugLogThread *)thread_data;
     int i;
     char timebuf[64];
     const char *pkt_src_str = NULL;
@@ -500,11 +498,11 @@ static int AlertDebugLogCondition(ThreadVars *tv, const Packet *p) {
 
 static int AlertDebugLogLogger(ThreadVars *tv, void *thread_data, const Packet *p) {
     if (PKT_IS_IPV4(p)) {
-        return AlertDebugLogger(tv, p, thread_data, NULL, NULL);
+        return AlertDebugLogger(tv, p, thread_data);
     } else if (PKT_IS_IPV6(p)) {
-        return AlertDebugLogger(tv, p, thread_data, NULL, NULL);
+        return AlertDebugLogger(tv, p, thread_data);
     } else if (p->events.cnt > 0) {
-        return AlertDebugLogDecoderEvent(tv, p, thread_data, NULL, NULL);
+        return AlertDebugLogDecoderEvent(tv, p, thread_data);
     }
     return TM_ECODE_OK;
 }