mirror of
https://github.com/zeek/zeek.git
synced 2025-10-13 03:58:20 +00:00
Remove EventRegistry::Used and EventRegistry::SetUsed
This commit is contained in:
parent
97fa7cdc0a
commit
e2b03681d1
11 changed files with 6 additions and 111 deletions
|
@ -21,23 +21,12 @@ EventHandlerPtr EventRegistry::Register(std::string_view name, bool is_from_scri
|
|||
if ( ! is_from_script )
|
||||
not_only_from_script.insert(std::string(name));
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
// Remove in v7.1
|
||||
h->SetUsed();
|
||||
#pragma GCC diagnostic pop
|
||||
return h;
|
||||
}
|
||||
|
||||
h = new EventHandler(std::string(name));
|
||||
event_registry->Register(h, is_from_script);
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
// Remove in v7.1
|
||||
h->SetUsed();
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
return h;
|
||||
}
|
||||
|
||||
|
@ -74,36 +63,6 @@ EventRegistry::string_list EventRegistry::Match(RE_Matcher* pattern) {
|
|||
return names;
|
||||
}
|
||||
|
||||
EventRegistry::string_list EventRegistry::UnusedHandlers() {
|
||||
string_list names;
|
||||
|
||||
for ( const auto& entry : handlers ) {
|
||||
EventHandler* v = entry.second.get();
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
if ( v->GetFunc() && ! v->Used() )
|
||||
names.push_back(entry.first);
|
||||
#pragma GCC diagnostic pop
|
||||
}
|
||||
|
||||
return names;
|
||||
}
|
||||
|
||||
EventRegistry::string_list EventRegistry::UsedHandlers() {
|
||||
string_list names;
|
||||
|
||||
for ( const auto& entry : handlers ) {
|
||||
EventHandler* v = entry.second.get();
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
if ( v->GetFunc() && v->Used() )
|
||||
names.push_back(entry.first);
|
||||
#pragma GCC diagnostic pop
|
||||
}
|
||||
|
||||
return names;
|
||||
}
|
||||
|
||||
EventRegistry::string_list EventRegistry::AllHandlers() {
|
||||
string_list names;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue