From: Carter Waxman Date: Fri, 22 Apr 2016 12:12:24 +0000 (-0400) Subject: fixed copyrights. removed useless code. X-Git-Tag: 3.0.0-233~431^2~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce3941a12530fed8e98bfbc0f3e2ee9ea8f0d139;p=thirdparty%2Fsnort3.git fixed copyrights. removed useless code. --- diff --git a/src/network_inspectors/packet_capture/capture_module.cc b/src/network_inspectors/packet_capture/capture_module.cc index 9b3dee90a..74823f3b3 100644 --- a/src/network_inspectors/packet_capture/capture_module.cc +++ b/src/network_inspectors/packet_capture/capture_module.cc @@ -1,5 +1,5 @@ //-------------------------------------------------------------------------- -// Copyright (C) 2014-2016 Cisco and/or its affiliates. All rights reserved. +// Copyright (C) 2016-2016 Cisco and/or its affiliates. All rights reserved. // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License Version 2 as published diff --git a/src/network_inspectors/packet_capture/capture_module.h b/src/network_inspectors/packet_capture/capture_module.h index 6419e6475..3b7c7861b 100644 --- a/src/network_inspectors/packet_capture/capture_module.h +++ b/src/network_inspectors/packet_capture/capture_module.h @@ -1,5 +1,5 @@ //-------------------------------------------------------------------------- -// Copyright (C) 2014-2016 Cisco and/or its affiliates. All rights reserved. +// Copyright (C) 2016-2016 Cisco and/or its affiliates. All rights reserved. // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License Version 2 as published diff --git a/src/network_inspectors/packet_capture/packet_capture.h b/src/network_inspectors/packet_capture/packet_capture.h index e0411baa6..532307405 100644 --- a/src/network_inspectors/packet_capture/packet_capture.h +++ b/src/network_inspectors/packet_capture/packet_capture.h @@ -1,6 +1,5 @@ //-------------------------------------------------------------------------- -// Copyright (C) 2014-2016 Cisco and/or its affiliates. All rights reserved. -// Copyright (C) 2002-2013 Sourcefire, Inc. +// Copyright (C) 2016-2016 Cisco and/or its affiliates. All rights reserved. // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License Version 2 as published diff --git a/src/network_inspectors/perf_monitor/perf_monitor.cc b/src/network_inspectors/perf_monitor/perf_monitor.cc index ea55fa3b4..4e1bd8028 100644 --- a/src/network_inspectors/perf_monitor/perf_monitor.cc +++ b/src/network_inspectors/perf_monitor/perf_monitor.cc @@ -277,19 +277,10 @@ static void mod_dtor(Module* m) { delete m; } static Inspector* pm_ctor(Module* m) -{ - static THREAD_LOCAL unsigned s_init = true; - - if ( !s_init ) - return nullptr; - - return new PerfMonitor((PerfMonModule*)m); -} +{ return new PerfMonitor((PerfMonModule*)m); } static void pm_dtor(Inspector* p) -{ - delete p; -} +{ delete p; } static const InspectApi pm_api = {