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

Val: RecordVal::LookupWithDefault() returns IntrusivePtr

Browse source
This commit is contained in:
Max Kellermann 2020-03-04 21:27:31 +01:00
parent d180ab0dd2
commit 79570fdfd6
9 changed files with 66 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Val.cc
View file

@ -577,7 +577,7 @@ static void BuildJSON(threading::formatter::JSON::NullDoubleWriter& writer, Val*
for ( auto i = 0; i < rt->NumFields(); ++i )
{
Val* value = rval->LookupWithDefault(i);
auto value = rval->LookupWithDefault(i);
if ( value && ( ! only_loggable || rt->FieldHasAttr(i, ATTR_LOG) ) )
{
@ -595,10 +595,8 @@ static void BuildJSON(threading::formatter::JSON::NullDoubleWriter& writer, Val*
else
key_str = field_name;
BuildJSON(writer, value, only_loggable, re, key_str);
BuildJSON(writer, value.get(), only_loggable, re, key_str);
}
Unref(value);
}
writer.EndObject();
@ -2611,14 +2609,14 @@ Val* RecordVal::Lookup(int field) const
return (*AsRecord())[field];
}
Val* RecordVal::LookupWithDefault(int field) const
IntrusivePtr<Val> RecordVal::LookupWithDefault(int field) const
{
Val* val = (*AsRecord())[field];
if ( val )
return val->Ref();
return {NewRef{}, val};
return Type()->AsRecordType()->FieldDefault(field).release();
return Type()->AsRecordType()->FieldDefault(field);
}
void RecordVal::ResizeParseTimeRecords()
@ -2644,14 +2642,14 @@ void RecordVal::ResizeParseTimeRecords()
parse_time_records.clear();
}
Val* RecordVal::Lookup(const char* field, bool with_default) const
IntrusivePtr<Val> RecordVal::Lookup(const char* field, bool with_default) const
{
int idx = Type()->AsRecordType()->FieldOffset(field);
if ( idx < 0 )
reporter->InternalError("missing record field: %s", field);
return with_default ? LookupWithDefault(idx) : Lookup(idx);
return with_default ? LookupWithDefault(idx) : IntrusivePtr{NewRef{}, Lookup(idx)};
}
IntrusivePtr<RecordVal> RecordVal::CoerceTo(const RecordType* t, Val* aggr, bool allow_orphaning) const