From 88a04742c013b2b4fe0bf6a86ece6d538a55458e Mon Sep 17 00:00:00 2001
From: Tom DeCanio <decanio.tom@gmail.com>
Date: Tue, 12 Nov 2013 18:48:37 -0800
Subject: [PATCH] JSON output cleanup

---
 src/output-dnslog.c | 4 ++--
 src/output-json.h   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/output-dnslog.c b/src/output-dnslog.c
index 78cf266617..bde53e0b91 100644
--- a/src/output-dnslog.c
+++ b/src/output-dnslog.c
@@ -85,7 +85,7 @@ static void CreateTypeString(uint16_t type, char *str, size_t str_size) {
     }
 }
 
-static void LogQuery(AlertJsonThread/*LogDnsLogThread*/ *aft, json_t *js, /*char *timebuf, char *srcip, char *dstip, Port sp, Port dp, char *proto, */ DNSTransaction *tx, DNSQueryEntry *entry) {
+static void LogQuery(AlertJsonThread *aft, json_t *js, DNSTransaction *tx, DNSQueryEntry *entry) {
     MemBuffer *buffer = (MemBuffer *)aft->buffer;
 
     SCLogDebug("got a DNS request and now logging !!");
@@ -169,7 +169,7 @@ static void AppendAnswer(json_t *djs, DNSTransaction *tx, DNSAnswerEntry *entry)
     json_array_append_new(djs, js);
 }
 
-static void LogAnswers(AlertJsonThread/*LogDnsLogThread*/ *aft, json_t *js, /*char *timebuf, char *srcip, char *dstip, Port sp, Port dp, char *proto,*/ DNSTransaction *tx) {
+static void LogAnswers(AlertJsonThread *aft, json_t *js, DNSTransaction *tx) {
     MemBuffer *buffer = (MemBuffer *)aft->buffer;
 
     SCLogDebug("got a DNS response and now logging !!");
diff --git a/src/output-json.h b/src/output-json.h
index fb981807df..17500eeeb7 100644
--- a/src/output-json.h
+++ b/src/output-json.h
@@ -55,7 +55,6 @@ typedef struct AlertJsonThread_ {
     uint64_t dns_cnt;
     uint64_t http_cnt;
     uint64_t tls_cnt;
-    //uint32_t http_flags;
     OutputCtx *http_ctx;
     OutputCtx *tls_ctx;
 } AlertJsonThread;