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

Switch ListVal to store IntrusivePtrs

Browse source 
* Deprecates ListVal::Index() methods and replaces with ListVal::Idx()

* Replaces ListVal::Vals() method with one that returns
  std::vector<IntrusivePtr<Val>> rather than val_list
This commit is contained in:
Jon Siwek 2020-05-05 14:13:14 -07:00
parent b422f68b88
commit 5f57ceb70a
19 changed files with 111 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/logging/Manager.cc
View file

@ -870,7 +870,7 @@ bool Manager::Write(EnumVal* id, RecordVal* columns_arg)
while ( (v = filter->config->AsTable()->NextEntry(k, c)) )
{
auto index = filter->config->RecoverIndex(k);
string key = index->Index(0)->AsString()->CheckString();
string key = index->Idx(0)->AsString()->CheckString();
string value = v->Value()->AsString()->CheckString();
info->config.insert(std::make_pair(copy_string(key.c_str()), copy_string(value.c_str())));
delete k;
@ -1022,7 +1022,7 @@ threading::Value* Manager::ValToLogVal(Val* val, BroType* ty)
lval->val.set_val.vals = new threading::Value* [lval->val.set_val.size];
for ( int i = 0; i < lval->val.set_val.size; i++ )
lval->val.set_val.vals[i] = ValToLogVal(set->Index(i));
lval->val.set_val.vals[i] = ValToLogVal(set->Idx(i).get());
Unref(set);
break;