From: Josh <jrosenba@cisco.com>
Date: Wed, 23 Jul 2014 13:18:21 +0000 (-0400)
Subject: removing regression tests
X-Git-Tag: 3.0.0-233~1175^2~14^2^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b598fb48c6575569cc771003045e7032164e61dd;p=thirdparty%2Fsnort3.git

removing regression tests
---

diff --git a/src/managers/packet_manager.cc b/src/managers/packet_manager.cc
index d30b04f8c..f20352f5f 100644
--- a/src/managers/packet_manager.cc
+++ b/src/managers/packet_manager.cc
@@ -248,7 +248,7 @@ static bool api_instantiated(const CodecApi* cd_api)
                     "Cannot find Codec %s's api", cd_api->base.name);
 
     int pos = p - s_codecs.begin();
-    if(instantiated_api[pos])
+    if(instantiated_api[(std::size_t)pos])
         return true;
 
     instantiated_api[pos] = true;
@@ -314,7 +314,7 @@ void PacketManager::instantiate(const CodecApi* cd_api , Module* m, SnortConfig*
                 s_protocols[s_proto_map[id]]->get_name(), cd->get_name(),
                 id, cd->get_name());
 
-        s_proto_map[id] = codec_id;
+        s_proto_map[id] = (uint8_t)codec_id;
     }
 
     s_protocols[codec_id++] = cd;
diff --git a/src/protocols/tcp.h b/src/protocols/tcp.h
index 449a40104..300b85a82 100644
--- a/src/protocols/tcp.h
+++ b/src/protocols/tcp.h
@@ -156,7 +156,7 @@ enum TcpOpt{
 
 inline void set_tcp_offset(TCPHdr *tcph, uint8_t value)
 {
-    tcph->th_offx2 = (tcph->th_offx2 & 0x0f) | (value << 4);
+    tcph->th_offx2 = (uint8_t)((tcph->th_offx2 & 0x0f) | (value << 4));
 }
 
 inline void set_tcp_x2(TCPHdr* tcph, uint8_t value)
diff --git a/src/sfip/sf_ip.h b/src/sfip/sf_ip.h
index 887556bb2..f5eb35b37 100644
--- a/src/sfip/sf_ip.h
+++ b/src/sfip/sf_ip.h
@@ -146,7 +146,7 @@ static inline void sfip_set_bits(sfip_t *p, int bits) {
 
     if(bits < 0 || bits > 128) return;
 
-    p->bits = bits;
+    p->bits = (int16_t)bits;
 }
 
 /* Returns the raw IP address as an in6_addr */
diff --git a/tools/snort2lua/data/dt_comment.h b/tools/snort2lua/data/dt_comment.h
index faf839c5b..c76715db6 100644
--- a/tools/snort2lua/data/dt_comment.h
+++ b/tools/snort2lua/data/dt_comment.h
@@ -29,7 +29,7 @@
 
 static const std::string start_comments =
     "\nCOMMENTS:\n"
-    "    these line were originally commented "
+    "    these line were commented "
     "in the configuration file.";
 
 static const std::string start_errors =