From 53977fded6efe1a1d1013899baf607343c339bf1 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Wed, 3 Feb 2010 09:35:33 +0100
Subject: [PATCH] Small compilation fixes when debugging is disabled.

---
 src/stream-tcp-reassemble.c | 18 ++++++------------
 src/stream-tcp.c            |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c
index 9806babcdf..ea3d4a926b 100644
--- a/src/stream-tcp-reassemble.c
+++ b/src/stream-tcp-reassemble.c
@@ -560,8 +560,7 @@ static int HandleSegmentStartsBeforeListSegment(TcpStream *stream,
 
             TcpSegment *new_seg = StreamTcpGetSegment(packet_length);
             if (new_seg == NULL) {
-                uint16_t idx = segment_pool_idx[packet_length];
-                SCLogDebug("segment_pool[%"PRIu16"] is empty", idx);
+                SCLogDebug("segment_pool[%"PRIu16"] is empty", segment_pool_idx[packet_length]);
                 SCReturnInt(-1);
             }
             new_seg->payload_len = packet_length;
@@ -623,8 +622,7 @@ static int HandleSegmentStartsBeforeListSegment(TcpStream *stream,
 
                 TcpSegment *new_seg = StreamTcpGetSegment(packet_length);
                 if (new_seg == NULL) {
-                    uint16_t idx = segment_pool_idx[packet_length];
-                    SCLogDebug("segment_pool[%"PRIu16"] is empty", idx);
+                    SCLogDebug("segment_pool[%"PRIu16"] is empty", segment_pool_idx[packet_length]);
                     SCReturnInt(-1);
                 }
 
@@ -683,8 +681,7 @@ static int HandleSegmentStartsBeforeListSegment(TcpStream *stream,
 
                     TcpSegment *new_seg = StreamTcpGetSegment(packet_length);
                     if (new_seg == NULL) {
-                        uint16_t idx = segment_pool_idx[packet_length];
-                        SCLogDebug("segment_pool[%"PRIu16"] is empty", idx);
+                        SCLogDebug("segment_pool[%"PRIu16"] is empty", segment_pool_idx[packet_length]);
                         SCReturnInt(-1);
                     }
                     new_seg->payload_len = packet_length;
@@ -889,8 +886,7 @@ static int HandleSegmentStartsAtSameListSegment(TcpStream *stream,
 
                 TcpSegment *new_seg = StreamTcpGetSegment(packet_length);
                 if (new_seg == NULL) {
-                    uint16_t idx = segment_pool_idx[packet_length];
-                    SCLogDebug("egment_pool[%"PRIu16"] is empty", idx);
+                    SCLogDebug("egment_pool[%"PRIu16"] is empty", segment_pool_idx[packet_length]);
                     return -1;
                 }
                 new_seg->payload_len = packet_length;
@@ -1073,8 +1069,7 @@ static int HandleSegmentStartsAfterListSegment(TcpStream *stream,
 
                 TcpSegment *new_seg = StreamTcpGetSegment(packet_length);
                 if (new_seg == NULL) {
-                    uint16_t idx = segment_pool_idx[packet_length];
-                    SCLogDebug("segment_pool[%"PRIu16"] is empty", idx);
+                    SCLogDebug("segment_pool[%"PRIu16"] is empty", segment_pool_idx[packet_length]);
                     SCReturnInt(-1);
                 }
                 new_seg->payload_len = packet_length;
@@ -1144,8 +1139,7 @@ int StreamTcpReassembleHandleSegmentHandleData(TcpSession *ssn,
 
     TcpSegment *seg = StreamTcpGetSegment(p->payload_len);
     if (seg == NULL) {
-        uint16_t idx = segment_pool_idx[p->payload_len];
-        SCLogDebug("segment_pool[%"PRIu16"] is empty", idx);
+        SCLogDebug("segment_pool[%"PRIu16"] is empty", segment_pool_idx[p->payload_len]);
         SCReturnInt(-1);
     }
 
diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index 0b3f9ecb30..9ff01ae1e7 100644
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -340,7 +340,7 @@ void StreamTcpFreeConfig(char quiet)
         SCLogError(SC_ERR_POOL_EMPTY, "ssn_pool is NULL");
         exit(EXIT_FAILURE);
     }
-    SCLogInfo("ssn_pool_cnt %"PRIu64"", ssn_pool_cnt);
+    SCLogDebug("ssn_pool_cnt %"PRIu64"", ssn_pool_cnt);
 
     SCLogInfo("Max memuse of stream engine %"PRIu32" (in use %"PRIu32")", stream_memuse_max, stream_memuse);
     SCMutexDestroy(&ssn_pool_mutex);