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 TableVal::FindAttr(), replace with GetAttr()

Browse source
This commit is contained in:
Jon Siwek 2020-05-26 15:46:46 -07:00
parent e365105872
commit ce6f69cd19
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Val.cc
View file

@ -1813,7 +1813,7 @@ bool TableVal::ExpandAndInit(IntrusivePtr<Val> index, IntrusivePtr<Val> new_val)
IntrusivePtr<Val> TableVal::Default(const IntrusivePtr<Val>& index)
{
Attr* def_attr = FindAttr(ATTR_DEFAULT);
const auto& def_attr = GetAttr(ATTR_DEFAULT);
if ( ! def_attr )
return nullptr;
@ -2199,9 +2199,9 @@ ListVal* TableVal::ConvertToPureList() const
return ToPureListVal().release();
}
Attr* TableVal::FindAttr(attr_tag t) const
const IntrusivePtr<Attr>& TableVal::GetAttr(attr_tag t) const
{
return attrs ? attrs->Find(t).get() : nullptr;
return attrs ? attrs->Find(t) : Attr::nil;
}
void TableVal::Describe(ODesc* d) const
@ -2340,7 +2340,8 @@ void TableVal::InitDefaultFunc(Frame* f)
if ( def_val )
return;
Attr* def_attr = FindAttr(ATTR_DEFAULT);
const auto& def_attr = GetAttr(ATTR_DEFAULT);
if ( ! def_attr )
return;