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

Remove all of the random single-file deprecations

Browse source 
These are the changes that don't require a ton of changes to other files outside
of the original removal.
This commit is contained in:
Tim Wojtulewicz 2021-01-21 11:49:36 -07:00
parent 7e9d89db0a
commit 0618be792f
270 changed files with 36 additions and 4632 deletions
Download patch file Download diff file Expand all files Collapse all files

76
src/Val.cc
View file

@ -1269,11 +1269,6 @@ void ListVal::Append(ValPtr v)
type->AsTypeList()->Append(vt);
}
void ListVal::Append(Val* v)
{
Append({AdoptRef{}, v});
}
TableValPtr ListVal::ToSetVal() const
{
if ( tag == TYPE_ANY )
@ -1291,11 +1286,6 @@ TableValPtr ListVal::ToSetVal() const
return t;
}
TableVal* ListVal::ConvertToSet() const
{
return ToSetVal().release();
}
void ListVal::Describe(ODesc* d) const
{
if ( d->IsBinary() || d->IsPortable() )
@ -1568,11 +1558,6 @@ bool TableVal::Assign(ValPtr index, ValPtr new_val, bool broker_forward,
return Assign(std::move(index), std::move(k), std::move(new_val), broker_forward, iterators_invalidated);
}
bool TableVal::Assign(Val* index, Val* new_val)
{
return Assign({NewRef{}, index}, {AdoptRef{}, new_val});
}
bool TableVal::Assign(ValPtr index, std::unique_ptr<detail::HashKey> k,
ValPtr new_val, bool broker_forward, bool* iterators_invalidated)
{
@ -1627,11 +1612,6 @@ bool TableVal::Assign(ValPtr index, std::unique_ptr<detail::HashKey> k,
return true;
}
bool TableVal::Assign(Val* index, detail::HashKey* k, Val* new_val)
{
return Assign({NewRef{}, index}, std::unique_ptr<detail::HashKey>{k}, {AdoptRef{}, new_val});
}
ValPtr TableVal::SizeVal() const
{
return val_mgr->Count(Size());
@ -1985,22 +1965,6 @@ bool TableVal::Contains(const IPAddr& addr) const
return (subnets->Lookup(addr, true) != 0);
}
Val* TableVal::Lookup(Val* index, bool use_default_val)
{
static ValPtr last_default;
last_default = nullptr;
ValPtr idx{NewRef{}, index};
if ( const auto& rval = Find(idx) )
return rval.get();
if ( ! use_default_val )
return nullptr;
last_default = Default(idx);
return last_default.get();
}
VectorValPtr TableVal::LookupSubnets(const SubNetVal* search)
{
if ( ! subnets )
@ -2333,11 +2297,6 @@ ListValPtr TableVal::ToListVal(TypeTag t) const
return l;
}
ListVal* TableVal::ConvertToList(TypeTag t) const
{
return ToListVal().release();
}
ListValPtr TableVal::ToPureListVal() const
{
const auto& tl = table_type->GetIndices()->GetTypes();
@ -2350,11 +2309,6 @@ ListValPtr TableVal::ToPureListVal() const
return ToListVal(tl[0]->Tag());
}
ListVal* TableVal::ConvertToPureList() const
{
return ToPureListVal().release();
}
const detail::AttrPtr& TableVal::GetAttr(detail::AttrTag t) const
{
return attrs ? attrs->Find(t) : detail::Attr::nil;
@ -2770,9 +2724,6 @@ unsigned int TableVal::MemoryAllocation() const
+ table_hash->MemoryAllocation();
}
detail::HashKey* TableVal::ComputeHash(const Val* index) const
{ return MakeHashKey(*index).release(); }
std::unique_ptr<detail::HashKey> TableVal::MakeHashKey(const Val& index) const
{
return table_hash->MakeHashKey(index, true);
@ -2834,10 +2785,6 @@ TableVal::TableRecordDependencies TableVal::parse_time_table_record_dependencies
RecordVal::RecordTypeValMap RecordVal::parse_time_records;
RecordVal::RecordVal(RecordType* t, bool init_fields)
: RecordVal({NewRef{}, t}, init_fields)
{}
RecordVal::RecordVal(RecordTypePtr t, bool init_fields) : Val(std::move(t))
{
origin = nullptr;
@ -2921,11 +2868,6 @@ void RecordVal::Assign(int field, ValPtr new_val)
Modified();
}
void RecordVal::Assign(int field, Val* new_val)
{
Assign(field, {AdoptRef{}, new_val});
}
ValPtr RecordVal::GetFieldOrDefault(int field) const
{
const auto& val = (*record_val)[field];
@ -3195,9 +3137,6 @@ ValPtr TypeVal::DoClone(CloneState* state)
return {NewRef{}, this};
}
VectorVal::VectorVal(VectorType* t) : VectorVal({NewRef{}, t})
{ }
VectorVal::VectorVal(VectorTypePtr t) : Val(std::move(t))
{
vector_val = new vector<ValPtr>();
@ -3682,11 +3621,6 @@ ValManager::ValManager()
}
}
StringVal* ValManager::GetEmptyString() const
{
return empty_string->Ref()->AsStringVal();
}
const PortValPtr& ValManager::Port(uint32_t port_num, TransportProto port_type) const
{
if ( port_num >= 65536 )
@ -3698,11 +3632,6 @@ const PortValPtr& ValManager::Port(uint32_t port_num, TransportProto port_type)
return ports[port_type][port_num];
}
PortVal* ValManager::GetPort(uint32_t port_num, TransportProto port_type) const
{
return Port(port_num, port_type)->Ref()->AsPortVal();
}
const PortValPtr& ValManager::Port(uint32_t port_num) const
{
auto mask = port_num & PORT_SPACE_MASK;
@ -3718,9 +3647,4 @@ const PortValPtr& ValManager::Port(uint32_t port_num) const
return Port(port_num, TRANSPORT_UNKNOWN);
}
PortVal* ValManager::GetPort(uint32_t port_num) const
{
return Port(port_num)->Ref()->AsPortVal();
}
}