Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

zeek-setup: Remove some unused headers

Browse source 
The zeek_binpac.h one isn't used directly, but keeping it over
<binpac.h> include. Also do some std prefixing. binpac.h has
'using namespace std', so these slip through :-(
This commit is contained in:
Arne Welzel 2024-11-15 16:17:19 +01:00
parent 0f1c1cb754
commit a46387075c
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/zeek-setup.cc
View file

@ -14,14 +14,15 @@
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <list> #include <list>
#include <memory>
#include <optional> #include <optional>
#include <set>
#include <string>
#ifdef USE_SQLITE #ifdef USE_SQLITE
#include "zeek/3rdparty/sqlite3.h" #include "zeek/3rdparty/sqlite3.h"
#endif #endif
#include "zeek/Anon.h"
#include "zeek/DFA.h"
#include "zeek/DNS_Mgr.h" #include "zeek/DNS_Mgr.h"
#include "zeek/Debug.h" #include "zeek/Debug.h"
#include "zeek/Desc.h" #include "zeek/Desc.h"
@ -42,8 +43,6 @@
#include "zeek/Scope.h" #include "zeek/Scope.h"
#include "zeek/ScriptCoverageManager.h" #include "zeek/ScriptCoverageManager.h"
#include "zeek/Stats.h" #include "zeek/Stats.h"
#include "zeek/Stmt.h"
#include "zeek/Tag.h"
#include "zeek/Timer.h" #include "zeek/Timer.h"
#include "zeek/Traverse.h" #include "zeek/Traverse.h"
#include "zeek/Trigger.h" #include "zeek/Trigger.h"
@ -54,7 +53,6 @@
#include "zeek/file_analysis/Manager.h" #include "zeek/file_analysis/Manager.h"
#include "zeek/input.h" #include "zeek/input.h"
#include "zeek/input/Manager.h" #include "zeek/input/Manager.h"
#include "zeek/input/readers/raw/Raw.h"
#include "zeek/iosource/Manager.h" #include "zeek/iosource/Manager.h"
#include "zeek/logging/Manager.h" #include "zeek/logging/Manager.h"
#include "zeek/module_util.h" #include "zeek/module_util.h"
@ -191,8 +189,8 @@ extern "C" char version[];
extern "C" const char zeek_build_info[]; extern "C" const char zeek_build_info[];
const char* zeek::detail::command_line_policy = nullptr; const char* zeek::detail::command_line_policy = nullptr;
vector<string> zeek::detail::params; std::vector<std::string> zeek::detail::params;
set<string> requested_plugins; std::set<std::string> requested_plugins;
const char* proc_status_file = nullptr; const char* proc_status_file = nullptr;
zeek::OpaqueTypePtr md5_type; zeek::OpaqueTypePtr md5_type;
@ -283,8 +281,8 @@ static bool show_plugins(int level) {
printf("\nInactive dynamic plugins:\n"); printf("\nInactive dynamic plugins:\n");
for ( plugin::Manager::inactive_plugin_list::const_iterator i = inactives.begin(); i != inactives.end(); i++ ) { for ( plugin::Manager::inactive_plugin_list::const_iterator i = inactives.begin(); i != inactives.end(); i++ ) {
string name = (*i).first; std::string name = (*i).first;
string path = (*i).second; std::string path = (*i).second;
printf(" %s (%s)\n", name.c_str(), path.c_str()); printf(" %s (%s)\n", name.c_str(), path.c_str());
} }
} }
@ -748,7 +746,7 @@ SetupResult setup(int argc, char** argv, Options* zopts) {
auto ipbb = make_intrusive<BuiltinFunc>(init_bifs, ipbid->Name(), false); auto ipbb = make_intrusive<BuiltinFunc>(init_bifs, ipbid->Name(), false);
if ( options.event_trace_file ) if ( options.event_trace_file )
etm = make_unique<EventTraceMgr>(*options.event_trace_file); etm = std::make_unique<EventTraceMgr>(*options.event_trace_file);
// Parsing involves reading input files, including any input // Parsing involves reading input files, including any input
// interactively provided by the user at the console. Temporarily // interactively provided by the user at the console. Temporarily
@ -784,7 +782,7 @@ SetupResult setup(int argc, char** argv, Options* zopts) {
// Assign the script_args for command line processing in Zeek scripts. // Assign the script_args for command line processing in Zeek scripts.
if ( ! options.script_args.empty() ) { if ( ! options.script_args.empty() ) {
auto script_args_val = id::find_val<VectorVal>("zeek_script_args"); auto script_args_val = id::find_val<VectorVal>("zeek_script_args");
for ( const string& script_arg : options.script_args ) { for ( const auto& script_arg : options.script_args ) {
script_args_val->Assign(script_args_val->Size(), make_intrusive<StringVal>(script_arg)); script_args_val->Assign(script_args_val->Size(), make_intrusive<StringVal>(script_arg));
} }
} }