Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-16 05:28:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move Func up to zeek namespace, rename BroFunc to ScriptFunc

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-02 14:10:04 -07:00
parent 86fdf0eaa9
commit a2bc42dd93
36 changed files with 190 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/broker/Data.cc
View file

@ -370,7 +370,7 @@ struct val_converter {
if ( ! frame )
return nullptr;
auto* b = dynamic_cast<zeek::detail::BroFunc*>(rval->AsFunc());
auto* b = dynamic_cast<zeek::detail::ScriptFunc*>(rval->AsFunc());
if ( ! b )
return nullptr;
@ -852,7 +852,7 @@ broker::expected<broker::data> bro_broker::val_to_data(const zeek::Val* v)
return {string(v->AsFile()->Name())};
case zeek::TYPE_FUNC:
{
const zeek::detail::Func* f = v->AsFunc();
const zeek::Func* f = v->AsFunc();
std::string name(f->Name());
broker::vector rval;
@ -860,8 +860,8 @@ broker::expected<broker::data> bro_broker::val_to_data(const zeek::Val* v)
if ( name.find("lambda_<") == 0 )
{
// Only BroFuncs have closures.
if ( auto b = dynamic_cast<const zeek::detail::BroFunc*>(f) )
// Only ScriptFuncs have closures.
if ( auto b = dynamic_cast<const zeek::detail::ScriptFunc*>(f) )
{
auto bc = b->SerializeClosure();
if ( ! bc )
@ -871,7 +871,7 @@ broker::expected<broker::data> bro_broker::val_to_data(const zeek::Val* v)
}
else
{
reporter->InternalWarning("Closure with non-BroFunc");
reporter->InternalWarning("Closure with non-ScriptFunc");
return broker::ec::invalid_data;
}
}