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

Move IntrusivePtr and utility methods to the zeek namespace

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-06-24 16:40:00 -04:00
parent 4668378d91
commit 9364e6a5b7
255 changed files with 3761 additions and 3730 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/threading/Manager.cc
View file

@ -165,7 +165,7 @@ bool Manager::SendEvent(MsgThread* thread, const std::string& name, const int nu
for ( int j = 0; j < num_vals; j++)
{
Val* v = Value::ValueToVal(std::string("thread ") + thread->Name(), vals[j], convert_error);
vl.emplace_back(AdoptRef{}, v);
vl.emplace_back(zeek::AdoptRef{}, v);
if ( v && ! convert_error && ! same_type(type->GetFieldType(j), v->GetType()) )
{

20
src/threading/SerialTypes.cc
View file

@ -524,10 +524,10 @@ Val* Value::ValueToVal(const std::string& source, const Value* val, bool& have_e
case zeek::TYPE_TABLE:
{
IntrusivePtr<zeek::TypeList> set_index;
zeek::IntrusivePtr<zeek::TypeList> set_index;
if ( val->val.set_val.size == 0 && val->subtype == zeek::TYPE_VOID )
// don't know type - unspecified table.
set_index = make_intrusive<zeek::TypeList>();
set_index = zeek::make_intrusive<zeek::TypeList>();
else
{
// all entries have to have the same type...
@ -535,7 +535,7 @@ Val* Value::ValueToVal(const std::string& source, const Value* val, bool& have_e
if ( stag == zeek::TYPE_VOID )
stag = val->val.set_val.vals[0]->type;
IntrusivePtr<zeek::Type> index_type;
zeek::IntrusivePtr<zeek::Type> index_type;
if ( stag == zeek::TYPE_ENUM )
{
@ -558,16 +558,16 @@ Val* Value::ValueToVal(const std::string& source, const Value* val, bool& have_e
else
index_type = zeek::base_type(stag);
set_index = make_intrusive<zeek::TypeList>(index_type);
set_index = zeek::make_intrusive<zeek::TypeList>(index_type);
set_index->Append(std::move(index_type));
}
auto s = make_intrusive<zeek::SetType>(std::move(set_index), nullptr);
auto s = zeek::make_intrusive<zeek::SetType>(std::move(set_index), nullptr);
TableVal* t = new TableVal(std::move(s));
for ( int j = 0; j < val->val.set_val.size; j++ )
{
Val* assignval = ValueToVal(source, val->val.set_val.vals[j], have_error);
t->Assign({AdoptRef{}, assignval}, nullptr);
t->Assign({zeek::AdoptRef{}, assignval}, nullptr);
}
return t;
@ -575,7 +575,7 @@ Val* Value::ValueToVal(const std::string& source, const Value* val, bool& have_e
case zeek::TYPE_VECTOR:
{
IntrusivePtr<zeek::Type> type;
zeek::IntrusivePtr<zeek::Type> type;
if ( val->val.vector_val.size == 0 && val->subtype == zeek::TYPE_VOID )
// don't know type - unspecified table.
@ -589,13 +589,13 @@ Val* Value::ValueToVal(const std::string& source, const Value* val, bool& have_e
type = zeek::base_type(val->subtype);
}
auto vt = make_intrusive<zeek::VectorType>(std::move(type));
auto v = make_intrusive<VectorVal>(std::move(vt));
auto vt = zeek::make_intrusive<zeek::VectorType>(std::move(type));
auto v = zeek::make_intrusive<VectorVal>(std::move(vt));
for ( int j = 0; j < val->val.vector_val.size; j++ )
{
auto el = ValueToVal(source, val->val.vector_val.vals[j], have_error);
v->Assign(j, {AdoptRef{}, el});
v->Assign(j, {zeek::AdoptRef{}, el});
}
return v.release();