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

Deprecate bro_int_t and bro_uint_t

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-06-28 15:32:26 -07:00
parent d066013793
commit f624c18383
67 changed files with 331 additions and 320 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/Val.cc
View file

@ -160,20 +160,20 @@ bool Val::IsOne() const
}
}
bro_int_t Val::InternalInt() const
zeek_int_t Val::InternalInt() const
{
if ( type->InternalType() == TYPE_INTERNAL_INT )
return AsInt();
else if ( type->InternalType() == TYPE_INTERNAL_UNSIGNED )
// ### should check here for overflow
return static_cast<bro_int_t>(AsCount());
return static_cast<zeek_int_t>(AsCount());
else
InternalWarning("bad request for InternalInt");
return 0;
}
bro_uint_t Val::InternalUnsigned() const
zeek_uint_t Val::InternalUnsigned() const
{
if ( type->InternalType() == TYPE_INTERNAL_UNSIGNED )
return AsCount();
@ -193,28 +193,28 @@ double Val::InternalDouble() const
return 0.0;
}
bro_int_t Val::CoerceToInt() const
zeek_int_t Val::CoerceToInt() const
{
if ( type->InternalType() == TYPE_INTERNAL_INT )
return AsInt();
else if ( type->InternalType() == TYPE_INTERNAL_UNSIGNED )
return static_cast<bro_int_t>(AsCount());
return static_cast<zeek_int_t>(AsCount());
else if ( type->InternalType() == TYPE_INTERNAL_DOUBLE )
return static_cast<bro_int_t>(AsDouble());
return static_cast<zeek_int_t>(AsDouble());
else
InternalWarning("bad request for CoerceToInt");
return 0;
}
bro_uint_t Val::CoerceToUnsigned() const
zeek_uint_t Val::CoerceToUnsigned() const
{
if ( type->InternalType() == TYPE_INTERNAL_UNSIGNED )
return AsCount();
else if ( type->InternalType() == TYPE_INTERNAL_INT )
return static_cast<bro_uint_t>(AsInt());
return static_cast<zeek_uint_t>(AsInt());
else if ( type->InternalType() == TYPE_INTERNAL_DOUBLE )
return static_cast<bro_uint_t>(AsDouble());
return static_cast<zeek_uint_t>(AsDouble());
else
InternalWarning("bad request for CoerceToUnsigned");
@ -722,7 +722,7 @@ uint32_t PortVal::Mask(uint32_t port_num, TransportProto port_type)
return port_num;
}
PortVal::PortVal(uint32_t p) : UnsignedValImplementation(base_type(TYPE_PORT), bro_uint_t(p)) { }
PortVal::PortVal(uint32_t p) : UnsignedValImplementation(base_type(TYPE_PORT), zeek_uint_t(p)) { }
uint32_t PortVal::Port() const
{
@ -3911,12 +3911,12 @@ ValPtr Val::MakeBool(bool b)
return make_intrusive<BoolVal>(b);
}
ValPtr Val::MakeInt(bro_int_t i)
ValPtr Val::MakeInt(zeek_int_t i)
{
return make_intrusive<IntVal>(i);
}
ValPtr Val::MakeCount(bro_uint_t u)
ValPtr Val::MakeCount(zeek_uint_t u)
{
return make_intrusive<CountVal>(u);
}