From: Josh <jrosenba@cisco.com>
Date: Wed, 7 May 2014 15:10:30 +0000 (-0400)
Subject: fixing xcode warnings
X-Git-Tag: 3.0.0-233~1526^2~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d3d831a6782b6dcb638350977121d3af697e1ba;p=thirdparty%2Fsnort3.git

fixing xcode warnings
---

diff --git a/src/codecs/misc/cd_gtp.cc b/src/codecs/misc/cd_gtp.cc
index bd6f6715a..c18ab5eac 100644
--- a/src/codecs/misc/cd_gtp.cc
+++ b/src/codecs/misc/cd_gtp.cc
@@ -153,7 +153,7 @@ bool GtpCodec::decode(const uint8_t *raw_pkt, const uint32_t len,
             {
                 uint16_t ext_hdr_len;
                 /*check length before reading data*/
-                if (len < lyr_len + 4)
+                if (len < (uint32_t)(lyr_len + 4))
                 {
                     codec_events::decoder_event(p, DECODE_GTP_BAD_LEN);
                     return false;
diff --git a/src/managers/packet_manager.cc b/src/managers/packet_manager.cc
index ee548853b..82986e310 100644
--- a/src/managers/packet_manager.cc
+++ b/src/managers/packet_manager.cc
@@ -67,13 +67,13 @@ static std::list<const CodecApi*> s_codecs;
 
 // when initialization arrays, although the zero is not required
 // the compiler complains about a missing-field-initiliezers
-static std::array<uint8_t, max_protocol_id> s_proto_map{0};
-static std::array<Codec*, 256> s_protocols{0};
+static std::array<uint8_t, max_protocol_id> s_proto_map{{0}};
+static std::array<Codec*, 256> s_protocols{{0}};
 static THREAD_LOCAL uint8_t grinder = 0;
 
 // statistics information
-static THREAD_LOCAL std::array<PegCount, 256 + gen_peg_size> s_stats{0};
-static std::array<PegCount, 256 + gen_peg_size> g_stats{0};
+static THREAD_LOCAL std::array<PegCount, 256 + gen_peg_size> s_stats{{0}};
+static std::array<PegCount, 256 + gen_peg_size> g_stats{{0}};
 static THREAD_LOCAL CdGenPegs pkt_cnt;
 
 //-------------------------------------------------------------------------