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

Deprecate TableVal::ConvertToList() and TableVal::ConvertToPureList()

Browse source 
Replaced with ToListVal() and ToPureListVal() that return IntrusivePtr
This commit is contained in:
Jon Siwek 2020-05-05 14:58:43 -07:00
parent 5f57ceb70a
commit b096e552d3
10 changed files with 37 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/logging/Manager.cc
View file

@ -1012,11 +1012,11 @@ threading::Value* Manager::ValToLogVal(Val* val, BroType* ty)
case TYPE_TABLE:
{
ListVal* set = val->AsTableVal()->ConvertToPureList();
auto set = val->AsTableVal()->ToPureListVal();
if ( ! set )
// ConvertToPureList has reported an internal warning
// ToPureListVal has reported an internal warning
// already. Just keep going by making something up.
set = new ListVal(TYPE_INT);
set = make_intrusive<ListVal>(TYPE_INT);
lval->val.set_val.size = set->Length();
lval->val.set_val.vals = new threading::Value* [lval->val.set_val.size];
@ -1024,7 +1024,6 @@ threading::Value* Manager::ValToLogVal(Val* val, BroType* ty)
for ( int i = 0; i < lval->val.set_val.size; i++ )
lval->val.set_val.vals[i] = ValToLogVal(set->Idx(i).get());
Unref(set);
break;
}