strip unneeded mstring.h includes

diff --git a/src/detection/detect.cc b/src/detection/detect.cc
index 2821aade9dc67a036a0ef044c81727531bc732c7..d64d45ecf258078110288b2b62b1e9950a3dd75a 100644 (file)
--- a/src/detection/detect.cc
+++ b/src/detection/detect.cc
@@ -40,7 +40,6 @@
 #include "main/analyzer.h"
 #include "snort.h"
 #include "util.h"
-#include "mstring.h"
 #include "tag.h"
 #include "pcrm.h"
 #include "fpcreate.h"

diff --git a/src/detection/signature.cc b/src/detection/signature.cc
index 3070d52fe9f95e7a19e6ece1d418e1c6ab7a08cf..0e87f2856b4107d8133876844988e8b718327bbd 100644 (file)
--- a/src/detection/signature.cc
+++ b/src/detection/signature.cc
@@ -26,7 +26,6 @@
 #include "util.h"
 #include "rules.h"
 #include "treenodes.h"
-#include "mstring.h"
 #include "hash/sfghash.h"
 #include "snort.h"
 #include "parser.h"

diff --git a/src/file_api/file_service.cc b/src/file_api/file_service.cc
index 7559f8c9ccd3ea5426fede8cd31dfa698260ca17..f0e611ef35cbf892cba047325b8be8a6cce6bd92 100644 (file)
--- a/src/file_api/file_service.cc
+++ b/src/file_api/file_service.cc
@@ -39,7 +39,6 @@
 #include "file_mime_config.h"
 
 #include "stream/stream_api.h"
-#include "mstring.h"
 #include "detect.h"
 #include "fpdetect.h"
 #include "packet_io/active.h"

diff --git a/src/file_api/file_service_config.cc b/src/file_api/file_service_config.cc
index 27148c10c4141f6be6e7891863580cb22e07f56b..1ba11c3d4ef8af094f6da1fc960fb98f5ebdf52e 100644 (file)
--- a/src/file_api/file_service_config.cc
+++ b/src/file_api/file_service_config.cc
@@ -31,7 +31,6 @@
 
 #include "snort_types.h"
 #include "util.h"
-#include "mstring.h"
 #include "parser.h"
 
 #include "libs/file_config.h"

diff --git a/src/file_api/libs/file_identifier.cc b/src/file_api/libs/file_identifier.cc
index 5a344eabd94c6c480ba34d7500146b0ff30e34bd..4a1bb66b7a0cfeaa185147495f3d8339c3e7f758 100644 (file)
--- a/src/file_api/libs/file_identifier.cc
+++ b/src/file_api/libs/file_identifier.cc
@@ -37,7 +37,6 @@
 #include "snort_debug.h"
 #include "parser.h"
 #include "util.h"
-#include "mstring.h"
 #include "sfghash.h"
 #include "file_config.h"
 

diff --git a/src/filters/detection_filter.cc b/src/filters/detection_filter.cc
index b5cc3a47fdcbbd41a7839704560f0e21fc454684..c01d250327483ad52196911b7ac6e43d2f892a16 100644 (file)
--- a/src/filters/detection_filter.cc
+++ b/src/filters/detection_filter.cc
@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mstring.h"
 #include "util.h"
 #include "parser.h"
 

diff --git a/src/filters/rate_filter.cc b/src/filters/rate_filter.cc
index 627df7f678d5a7ad7b951f23ad23a3fd720bf3cb..d53cbc2d6e635eac64d2ae82dea23a791df3de51 100644 (file)
--- a/src/filters/rate_filter.cc
+++ b/src/filters/rate_filter.cc
@@ -36,7 +36,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mstring.h"
 #include "util.h"
 #include "parser.h"
 

diff --git a/src/filters/sfthreshold.cc b/src/filters/sfthreshold.cc
index 4c977648718d84da5cc7a48801fef1a653d08a41..e81eedb8c84e62e6749ce38d40233ff650693b5c 100644 (file)
--- a/src/filters/sfthreshold.cc
+++ b/src/filters/sfthreshold.cc
@@ -43,7 +43,6 @@
 #include <string.h>
 
 #include "main/analyzer.h"
-#include "mstring.h"
 #include "util.h"
 #include "parser.h"
 

diff --git a/src/ips_options/ips_base64.cc b/src/ips_options/ips_base64.cc
index 8704a87bdf9fa494ee7fcd8dec17d96cfd32d1a3..e3f2351533b9df4cfc79f7fd408e3ff055bd2a2d 100644 (file)
--- a/src/ips_options/ips_base64.cc
+++ b/src/ips_options/ips_base64.cc
@@ -34,7 +34,6 @@
 #include "parser.h"
 #include "snort_debug.h"
 #include "util.h"
-#include "mstring.h"
 #include "snort.h"
 #include "profiler.h"
 #include "fpdetect.h"

diff --git a/src/ips_options/ips_byte_jump.cc b/src/ips_options/ips_byte_jump.cc
index cb0eee2738c7a331ab2d8814853d076a1b8a205c..1eb1a6b8875ab27f8cea2ff52c275d9156d1d364 100644 (file)
--- a/src/ips_options/ips_byte_jump.cc
+++ b/src/ips_options/ips_byte_jump.cc
@@ -80,7 +80,6 @@
 #include "parser.h"
 #include "snort_debug.h"
 #include "util.h"
-#include "mstring.h"
 #include "extract.h"
 #include "ips_byte_extract.h"
 #include "sfhashfcn.h"

diff --git a/src/ips_options/ips_byte_test.cc b/src/ips_options/ips_byte_test.cc
index 536a0670643bd5b203a4ece23ae164137f8678b3..0fcb74ed5927026629c035718f34ba9a338e6a43 100644 (file)
--- a/src/ips_options/ips_byte_test.cc
+++ b/src/ips_options/ips_byte_test.cc
@@ -102,7 +102,6 @@ using namespace std;
 #include "parser.h"
 #include "snort_debug.h"
 #include "util.h"
-#include "mstring.h"
 #include "sfhashfcn.h"
 #include "ips_byte_extract.h"
 #include "snort.h"

diff --git a/src/ips_options/ips_content.cc b/src/ips_options/ips_content.cc
index bd57cd48343bca38cb9c5b99c3a135c728e6498d..7590e31739d19d753edbc8a3d73f5b2bb7803745 100644 (file)
--- a/src/ips_options/ips_content.cc
+++ b/src/ips_options/ips_content.cc
@@ -33,7 +33,6 @@
 #include "snort_bounds.h"
 #include "detection/treenodes.h"
 #include "snort_debug.h"
-#include "parser/mstring.h"
 #include "utils/boyer_moore.h"
 #include "util.h"
 #include "parser/parser.h"

diff --git a/src/ips_options/ips_cvs.cc b/src/ips_options/ips_cvs.cc
index 8d46d449b1e0fbd4e3cbb309bc9b4788b48a205e..bfc27b8d07e2d1e1d6f1028c2b4233c9e639cf65 100644 (file)
--- a/src/ips_options/ips_cvs.cc
+++ b/src/ips_options/ips_cvs.cc
@@ -52,7 +52,6 @@
 #include "parser.h"
 #include "snort_debug.h"
 #include "util.h"
-#include "mstring.h"
 #include "snort_bounds.h"
 #include "profiler.h"
 #include "fpdetect.h"

diff --git a/src/ips_options/ips_pcre.cc b/src/ips_options/ips_pcre.cc
index 485f7bb3d3328d933c9ac55f2b29a0380fd1fe11..285122541a6da849573744121110a9d8ac510182 100644 (file)
--- a/src/ips_options/ips_pcre.cc
+++ b/src/ips_options/ips_pcre.cc
@@ -35,7 +35,6 @@
 #include "protocols/packet.h"
 #include "parser.h"
 #include "util.h"
-#include "mstring.h"
 #include "sfhashfcn.h"
 #include "snort.h"
 #include "profiler.h"

diff --git a/src/loggers/alert_fast.cc b/src/loggers/alert_fast.cc
index a39e2b4c940655b5837ebe01faf88f27902e996e..7daa0284256fae4a1d33f6898c0676903a40450c 100644 (file)
--- a/src/loggers/alert_fast.cc
+++ b/src/loggers/alert_fast.cc
@@ -51,7 +51,6 @@
 #include "snort_debug.h"
 #include "parser.h"
 #include "util.h"
-#include "mstring.h"
 #include "packet_io/active.h"
 #include "log/text_log.h"
 #include "log/log_text.h"

diff --git a/src/loggers/alert_full.cc b/src/loggers/alert_full.cc
index 3345ea884b33cca1033b5ddbafed0c4d8d06ec41..acf8a35d3922474684bec51033a9a81ff6cedc76 100644 (file)
--- a/src/loggers/alert_full.cc
+++ b/src/loggers/alert_full.cc
@@ -50,7 +50,6 @@
 #include "snort_debug.h"
 #include "parser.h"
 #include "util.h"
-#include "mstring.h"
 #include "snort.h"
 #include "log/text_log.h"
 #include "log/log_text.h"

diff --git a/src/loggers/alert_syslog.cc b/src/loggers/alert_syslog.cc
index 443e026fa6543f085d0839045ad4a80171769ec4..1ba665bdb85e8d637df73d213334d8557ce4dbed 100644 (file)
--- a/src/loggers/alert_syslog.cc
+++ b/src/loggers/alert_syslog.cc
@@ -37,7 +37,6 @@
 #include "treenodes.h"
 #include "snort_debug.h"
 #include "parser.h"
-#include "mstring.h"
 #include "util.h"
 #include "util_net.h"
 #include "snort.h"

diff --git a/src/loggers/alert_test.cc b/src/loggers/alert_test.cc
index c27daa8d7cc7a15d6fd12d7730e893f6b9f06f62..67bf38fa13096f2fca970af6bde2aea41a989d67 100644 (file)
--- a/src/loggers/alert_test.cc
+++ b/src/loggers/alert_test.cc
@@ -37,7 +37,6 @@
 #include "util.h"
 #include "log/log_text.h"
 #include "log/text_log.h"
-#include "mstring.h"
 #include "snort.h"
 #include "utils/stats.h"
 

diff --git a/src/loggers/log_pcap.cc b/src/loggers/log_pcap.cc
index 0e51c395d7737b084619dbde60d0c6c63c033354..20222982ff78b655a4705984fa09da1929b837c0 100644 (file)
--- a/src/loggers/log_pcap.cc
+++ b/src/loggers/log_pcap.cc
@@ -41,7 +41,6 @@ extern "C" {
 #include "framework/module.h"
 #include "protocols/packet.h"
 #include "event.h"
-#include "mstring.h"
 #include "parser.h"
 #include "snort_debug.h"
 #include "util.h"

diff --git a/src/loggers/unified2.cc b/src/loggers/unified2.cc
index 93244a8f90caf98621a6713ce3cdd9d332408a9c..90351bc4dc8b5403e42aa5bb4adf307d82c8069c 100644 (file)
--- a/src/loggers/unified2.cc
+++ b/src/loggers/unified2.cc
@@ -50,7 +50,6 @@
 #include "util.h"
 #include "parser.h"
 #include "snort_debug.h"
-#include "mstring.h"
 #include "event.h"
 #include "snort_debug.h"
 #include "snort_bounds.h"

diff --git a/src/main/snort.cc b/src/main/snort.cc
index 924659a2189dbe8068fb1f941614fc4bac99e589..0fc15ec1a0965580241fd69fec58b3ac1ed4ab68 100644 (file)
--- a/src/main/snort.cc
+++ b/src/main/snort.cc
@@ -69,7 +69,6 @@ using namespace std;
 #include "packet_io/trough.h"
 #include "tag.h"
 #include "detect.h"
-#include "mstring.h"
 #include "fpcreate.h"
 #include "fpdetect.h"
 #include "filters/sfthreshold.h"

diff --git a/src/network_inspectors/arp_spoof/arp_spoof.cc b/src/network_inspectors/arp_spoof/arp_spoof.cc
index ccd0c5c3040f2441931054cb912d0d2ed07b2e46..a027fb4eacf4cf4ee3453adf8f2b78e9de1d7626 100644 (file)
--- a/src/network_inspectors/arp_spoof/arp_spoof.cc
+++ b/src/network_inspectors/arp_spoof/arp_spoof.cc
@@ -82,7 +82,6 @@
 #include "protocols/packet.h"
 #include "event.h"
 #include "parser.h"
-#include "mstring.h"
 #include "util.h"
 
 #include "snort.h"

diff --git a/src/network_inspectors/perf_monitor/perf_monitor.cc b/src/network_inspectors/perf_monitor/perf_monitor.cc
index 3a9be063f804d4e30bc8fa5ca6b8c6d30f506476..d27dac3602de0352c873d5efa0ea5ff8711ff762 100644 (file)
--- a/src/network_inspectors/perf_monitor/perf_monitor.cc
+++ b/src/network_inspectors/perf_monitor/perf_monitor.cc
@@ -41,7 +41,6 @@
 #include "perf_module.h"
 #include "main/analyzer.h"
 #include "snort_types.h"
-#include "mstring.h"
 #include "util.h"
 #include "snort_debug.h"
 #include "parser.h"

diff --git a/src/parser/parse_conf.cc b/src/parser/parse_conf.cc
index 53e0b43d314f477814671f809b2584d60b5304de..7471e39046f039257477709492819bb8a8ebef7f 100644 (file)
--- a/src/parser/parse_conf.cc
+++ b/src/parser/parse_conf.cc
@@ -54,7 +54,6 @@
 #include "parse_rule.h"
 #include "snort_debug.h"
 #include "util.h"
-#include "mstring.h"
 #include "fpcreate.h"
 #include "signature.h"
 #include "snort.h"

diff --git a/src/parser/parse_ip.cc b/src/parser/parse_ip.cc
index 72b790e6eb2bcc3766af14bd50f3957dc426a931..c14eab35792279121db20b43b703f5ffa065123a 100644 (file)
--- a/src/parser/parse_ip.cc
+++ b/src/parser/parse_ip.cc
@@ -31,7 +31,6 @@
 #include <sys/types.h>
 
 #include "util.h"
-#include "mstring.h"
 #include "parser.h"
 #include "snort_debug.h"
 #include "snort.h"

diff --git a/src/parser/parse_rule.cc b/src/parser/parse_rule.cc
index 735f2e396248df72145f57e8c079b65d1c333faf..8d24233645365f0d73d8546c3d1c2afba90fae94 100644 (file)
--- a/src/parser/parse_rule.cc
+++ b/src/parser/parse_rule.cc
@@ -45,7 +45,6 @@
 #include "parse_conf.h"
 #include "snort_debug.h"
 #include "util.h"
-#include "mstring.h"
 #include "detect.h"
 #include "protocols/packet.h"
 #include "fpcreate.h"

diff --git a/src/parser/vars.cc b/src/parser/vars.cc
index 3f57498794ad19e20c005fe0b6ad2dcb8cdd17f8..1b403a2808ad3699e804d00b5376baff74bd9dce 100644 (file)
--- a/src/parser/vars.cc
+++ b/src/parser/vars.cc
@@ -44,7 +44,6 @@
 #include "parser/cmd_line.h"
 #include "snort_debug.h"
 #include "util.h"
-#include "mstring.h"
 #include "detect.h"
 #include "protocols/packet.h"
 #include "fpcreate.h"

diff --git a/src/service_inspectors/back_orifice/back_orifice.cc b/src/service_inspectors/back_orifice/back_orifice.cc
index f788b4fdda986a40fd9b71ce1a6d16a9666f8b4c..88f1dc1ac43c29de5e2fe4133131a5ae780ea90b 100644 (file)
--- a/src/service_inspectors/back_orifice/back_orifice.cc
+++ b/src/service_inspectors/back_orifice/back_orifice.cc
@@ -122,7 +122,6 @@
 #include "event.h"
 #include "parser.h"
 #include "snort_debug.h"
-#include "mstring.h"
 #include "util.h"
 #include "profiler.h"
 #include "snort_types.h"

diff --git a/src/service_inspectors/ftp_telnet/ft_main.cc b/src/service_inspectors/ftp_telnet/ft_main.cc
index b491680e8c7705e5151762dec23d2fa87c6c5e12..ab2d7e70278a71d1127910a839a93bd2f69d175f 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ft_main.cc
+++ b/src/service_inspectors/ftp_telnet/ft_main.cc
@@ -64,7 +64,6 @@
 #include "profiler.h"
 #include "detection_util.h"
 #include "parser.h"
-#include "mstring.h"
 #include "sfsnprintfappend.h"
 
 #ifdef PERF_PROFILING

diff --git a/src/service_inspectors/ftp_telnet/ftp_print.cc b/src/service_inspectors/ftp_telnet/ftp_print.cc
index 03e8a2b7db9d5f452cdfbcd9a18810328ba360ee..9edeacb6c489f5ee6b702a2dfbe3cc340e22c4d6 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp_print.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_print.cc
@@ -51,7 +51,6 @@
 #include "profiler.h"
 #include "detection_util.h"
 #include "parser.h"
-#include "mstring.h"
 #include "sfsnprintfappend.h"
 
 int PrintConfOpt(bool on, const char* Option)

diff --git a/src/service_inspectors/http_inspect/hi_client.cc b/src/service_inspectors/http_inspect/hi_client.cc
index a5e922002b45cb0ae274453d50a1cf86ae5e18eb..ca606381190df9cd8e57b7ebe1a57556d5571761 100644 (file)
--- a/src/service_inspectors/http_inspect/hi_client.cc
+++ b/src/service_inspectors/http_inspect/hi_client.cc
@@ -61,7 +61,6 @@
 #include "hi_util_hbm.h"
 #include "hi_return_codes.h"
 #include "util.h"
-#include "mstring.h"
 #include "utils/util_unfold.h"
 #include "hi_cmd_lookup.h"
 #include "detection_util.h"

diff --git a/src/service_inspectors/http_inspect/http_inspect.cc b/src/service_inspectors/http_inspect/http_inspect.cc
index 5437ad2c0fcfe650e4028c718069741407b2c27b..fca90cf5629db7f0fcc3526e8f0bc1cdd7917a63 100644 (file)
--- a/src/service_inspectors/http_inspect/http_inspect.cc
+++ b/src/service_inspectors/http_inspect/http_inspect.cc
@@ -61,7 +61,6 @@
 
 #include "snort.h"
 #include "profiler.h"
-#include "mstring.h"
 #include "detection_util.h"
 
 #include "stream/stream_api.h"

diff --git a/src/service_inspectors/rpc_decode/rpc_decode.cc b/src/service_inspectors/rpc_decode/rpc_decode.cc
index 8dea66cb9e0f8e17176f1cff0bfe730a9779180c..f2e3efc9c52e1627c2d061e59ca0ebc4681e0ea0 100644 (file)
--- a/src/service_inspectors/rpc_decode/rpc_decode.cc
+++ b/src/service_inspectors/rpc_decode/rpc_decode.cc
@@ -50,7 +50,6 @@
 #include "parser.h"
 #include "snort_debug.h"
 #include "util.h"
-#include "mstring.h"
 #include "snort.h"
 #include "detect.h"
 #include "log.h"

diff --git a/src/stream/icmp/icmp_session.cc b/src/stream/icmp/icmp_session.cc
index a8b53457f076edf7541cebd731c488e72f575892..c2a55b17d6e259c28197290d0c1127f27d86006e 100644 (file)
--- a/src/stream/icmp/icmp_session.cc
+++ b/src/stream/icmp/icmp_session.cc
@@ -28,7 +28,6 @@
 #include "snort_types.h"
 #include "snort_debug.h"
 #include "protocols/packet.h"
-#include "mstring.h"
 #include "sfxhash.h"
 #include "util.h"
 #include "stream/stream.h"

diff --git a/src/stream/stream_api.cc b/src/stream/stream_api.cc
index 92dea2dc7f5eec0c1534d7a7f890743b81a1fb4d..e53f980e0a40f7ec1c0473ee3700396f47a610d9 100644 (file)
--- a/src/stream/stream_api.cc
+++ b/src/stream/stream_api.cc
@@ -41,7 +41,6 @@
 #include "udp/stream_udp.h"
 #include "icmp/stream_icmp.h"
 #include "ip/stream_ip.h"
-#include "mstring.h"
 #include "protocols/packet.h"
 #include "detect.h"
 #include "perf_monitor/perf.h"

diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc
index 5c9d0022c09f5926c64304933ba162a66cb5ea2e..aa41bfde1e28d3a48645af8b935cb86b9a1444ce 100644 (file)
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -57,7 +57,6 @@
 #include "snort_types.h"
 #include "snort_debug.h"
 #include "detect.h"
-#include "mstring.h"
 #include "sfxhash.h"
 #include "util.h"
 #include "sflsq.h"

diff --git a/src/stream/udp/udp_session.cc b/src/stream/udp/udp_session.cc
index 1d4d24bc483c7a0a217f613b8ad8ca12b3b467da..9f20a5d04e671150c513f73483fc3be551f750c4 100644 (file)
--- a/src/stream/udp/udp_session.cc
+++ b/src/stream/udp/udp_session.cc
@@ -29,7 +29,6 @@
 #include "snort_types.h"
 #include "snort_debug.h"
 #include "detect.h"
-#include "mstring.h"
 #include "sfxhash.h"
 #include "util.h"
 #include "protocols/packet.h"

diff --git a/src/target_based/sftarget_reader.cc b/src/target_based/sftarget_reader.cc
index d30bf807a23137ada6da470069e701ec51a97732..a032179d3912f2ca26b12f93d5809d5e644a4ed5 100644 (file)
--- a/src/target_based/sftarget_reader.cc
+++ b/src/target_based/sftarget_reader.cc
@@ -36,7 +36,6 @@
 #include <unistd.h>
 #include <time.h>
 
-#include "mstring.h"
 #include "util.h"
 #include "parser.h"
 #include "sftarget_protocol_reference.h"

diff --git a/src/utils/util.cc b/src/utils/util.cc
index b6ca42508370c792686c87bb78bacad9101e054c..c377a73be8e40088771b31a34c2e411e1c345b96 100644 (file)
--- a/src/utils/util.cc
+++ b/src/utils/util.cc
@@ -48,7 +48,6 @@
 #include <sys/resource.h>
 
 #include "snort.h"
-#include "mstring.h"
 #include "snort_debug.h"
 #include "parser.h"
 #include "packet_io/sfdaq.h"