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

Deprecate RecordVal::LookupWithDefault() replace with GetFieldOrDefault()

Browse source 
(The former was previously changed during this release cycle to return
Intrusive pointer, but this just changes it back to return Val* and
deprecates it).
This commit is contained in:
Jon Siwek 2020-05-19 19:49:43 -07:00
parent f729247778
commit 2b4d80c849
7 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Val.cc
View file

@ -580,7 +580,7 @@ static void BuildJSON(threading::formatter::JSON::NullDoubleWriter& writer, Val*
for ( auto i = 0; i < rt->NumFields(); ++i )
{
auto value = rval->LookupWithDefault(i);
auto value = rval->GetFieldOrDefault(i);
if ( value && ( ! only_loggable || rt->FieldHasAttr(i, ATTR_LOG) ) )
{
@ -2741,7 +2741,7 @@ void RecordVal::Assign(int field, Val* new_val)
Assign(field, {AdoptRef{}, new_val});
}
IntrusivePtr<Val> RecordVal::LookupWithDefault(int field) const
IntrusivePtr<Val> RecordVal::GetFieldOrDefault(int field) const
{
const auto& val = (*AsRecord())[field];
@ -2788,7 +2788,7 @@ IntrusivePtr<Val> RecordVal::Lookup(const char* field, bool with_default) const
if ( idx < 0 )
reporter->InternalError("missing record field: %s", field);
return with_default ? LookupWithDefault(idx) : GetField(idx);
return with_default ? GetFieldOrDefault(idx) : GetField(idx);
}
IntrusivePtr<RecordVal> RecordVal::CoerceTo(IntrusivePtr<RecordType> t,