From: Russ Combs Date: Sat, 21 Feb 2015 19:07:38 +0000 (-0500) Subject: strip unneeded mstring.h includes X-Git-Tag: 3.0.0-233~1040 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1de4a3c0e91bd98995eec8af553ee7ef11dbd690;p=thirdparty%2Fsnort3.git strip unneeded mstring.h includes --- diff --git a/src/detection/detect.cc b/src/detection/detect.cc index 2821aade9..d64d45ecf 100644 --- 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 3070d52fe..0e87f2856 100644 --- 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 7559f8c9c..f0e611ef3 100644 --- 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 27148c10c..1ba11c3d4 100644 --- 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 5a344eabd..4a1bb66b7 100644 --- 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 b5cc3a47f..c01d25032 100644 --- a/src/filters/detection_filter.cc +++ b/src/filters/detection_filter.cc @@ -23,7 +23,6 @@ #include #include -#include "mstring.h" #include "util.h" #include "parser.h" diff --git a/src/filters/rate_filter.cc b/src/filters/rate_filter.cc index 627df7f67..d53cbc2d6 100644 --- a/src/filters/rate_filter.cc +++ b/src/filters/rate_filter.cc @@ -36,7 +36,6 @@ #include #include -#include "mstring.h" #include "util.h" #include "parser.h" diff --git a/src/filters/sfthreshold.cc b/src/filters/sfthreshold.cc index 4c9776487..e81eedb8c 100644 --- a/src/filters/sfthreshold.cc +++ b/src/filters/sfthreshold.cc @@ -43,7 +43,6 @@ #include #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 8704a87bd..e3f235153 100644 --- 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 cb0eee273..1eb1a6b88 100644 --- 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 536a06706..0fcb74ed5 100644 --- 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 bd57cd483..7590e3173 100644 --- 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 8d46d449b..bfc27b8d0 100644 --- 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 485f7bb3d..285122541 100644 --- 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 a39e2b4c9..7daa02842 100644 --- 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 3345ea884..acf8a35d3 100644 --- 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 443e026fa..1ba665bdb 100644 --- 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 c27daa8d7..67bf38fa1 100644 --- 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 0e51c395d..20222982f 100644 --- 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 93244a8f9..90351bc4d 100644 --- 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 924659a21..0fc15ec1a 100644 --- 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 ccd0c5c30..a027fb4ea 100644 --- 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 3a9be063f..d27dac360 100644 --- 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 53e0b43d3..7471e3904 100644 --- 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 72b790e6e..c14eab357 100644 --- a/src/parser/parse_ip.cc +++ b/src/parser/parse_ip.cc @@ -31,7 +31,6 @@ #include #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 735f2e396..8d2423364 100644 --- 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 3f5749879..1b403a280 100644 --- 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 f788b4fdd..88f1dc1ac 100644 --- 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 b491680e8..ab2d7e702 100644 --- 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 03e8a2b7d..9edeacb6c 100644 --- 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 a5e922002..ca6063811 100644 --- 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 5437ad2c0..fca90cf56 100644 --- 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 8dea66cb9..f2e3efc9c 100644 --- 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 a8b53457f..c2a55b17d 100644 --- 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 92dea2dc7..e53f980e0 100644 --- 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 5c9d0022c..aa41bfde1 100644 --- 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 1d4d24bc4..9f20a5d04 100644 --- 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 d30bf807a..a032179d3 100644 --- a/src/target_based/sftarget_reader.cc +++ b/src/target_based/sftarget_reader.cc @@ -36,7 +36,6 @@ #include #include -#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 b6ca42508..c377a73be 100644 --- a/src/utils/util.cc +++ b/src/utils/util.cc @@ -48,7 +48,6 @@ #include #include "snort.h" -#include "mstring.h" #include "snort_debug.h" #include "parser.h" #include "packet_io/sfdaq.h"