From: Russ Combs Date: Sat, 23 Aug 2014 20:24:32 +0000 (-0400) Subject: fixed xcode warnings X-Git-Tag: 3.0.0-233~1419^2~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95071fa9f76e09a2b9b3689118f5258283bd85e7;p=thirdparty%2Fsnort3.git fixed xcode warnings --- diff --git a/ChangeLog b/ChangeLog index 492762b01..7e383ed76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ -- deleted profile.rules.file and profile.modules.file -- deleted alerts.alert_file -- changed --help to just cmd line options and added --help! +-- fixed Xcode warnings 115 -- remove share.h diff --git a/src/actions/act_replace.cc b/src/actions/act_replace.cc index e1ac578d7..3cba768ea 100644 --- a/src/actions/act_replace.cc +++ b/src/actions/act_replace.cc @@ -139,9 +139,6 @@ public: ReplaceAction(ReplaceModule*); void exec(Packet*); - -private: - unsigned flags; }; ReplaceAction::ReplaceAction(ReplaceModule*) : diff --git a/src/loggers/alert_test.cc b/src/loggers/alert_test.cc index 37af2e82b..f3c80a977 100644 --- a/src/loggers/alert_test.cc +++ b/src/loggers/alert_test.cc @@ -181,7 +181,7 @@ void TestLogger::alert(Packet *p, const char *msg, Event *event) if (flags & TEST_FLAG_SESSION) LogIpAddrs(test_file, p); - if ( (flags & TEST_FLAG_REBUILT) && (p->packet_flags && PKT_PSEUDO) ) + if ( (flags & TEST_FLAG_REBUILT) && (p->packet_flags & PKT_PSEUDO) ) { const char* s; switch ( p->pseudo_type ) diff --git a/tools/snort2lua/preprocessor_states/pps_stream_tcp.cc b/tools/snort2lua/preprocessor_states/pps_stream_tcp.cc index e9c49d2c1..555a3c7f4 100644 --- a/tools/snort2lua/preprocessor_states/pps_stream_tcp.cc +++ b/tools/snort2lua/preprocessor_states/pps_stream_tcp.cc @@ -187,7 +187,6 @@ bool StreamTcp::parse_protocol(std::istringstream& arg_stream) std::string dir; std::string lua_dir; std::string protocol; - bool tmpval = true; std::vector* protocols; Binder* bind;