Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-14 04:28:20 +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

8
src/threading/SerialTypes.cc
View file

@ -103,7 +103,7 @@ Value::~Value()
else if ( type == TYPE_TABLE )
{
for ( bro_int_t i = 0; i < val.set_val.size; i++ )
for ( zeek_int_t i = 0; i < val.set_val.size; i++ )
delete val.set_val.vals[i];
delete[] val.set_val.vals;
@ -111,7 +111,7 @@ Value::~Value()
else if ( type == TYPE_VECTOR )
{
for ( bro_int_t i = 0; i < val.vector_val.size; i++ )
for ( zeek_int_t i = 0; i < val.vector_val.size; i++ )
delete val.vector_val.vals[i];
delete[] val.vector_val.vals;
@ -286,7 +286,7 @@ bool Value::Read(detail::SerializationFormat* fmt)
val.set_val.vals = new Value*[val.set_val.size];
for ( bro_int_t i = 0; i < val.set_val.size; ++i )
for ( zeek_int_t i = 0; i < val.set_val.size; ++i )
{
val.set_val.vals[i] = new Value;
@ -304,7 +304,7 @@ bool Value::Read(detail::SerializationFormat* fmt)
val.vector_val.vals = new Value*[val.vector_val.size];
for ( bro_int_t i = 0; i < val.vector_val.size; ++i )
for ( zeek_int_t i = 0; i < val.vector_val.size; ++i )
{
val.vector_val.vals[i] = new Value;

8
src/threading/SerialTypes.h
View file

@ -117,13 +117,13 @@ struct Value
struct set_t
{
bro_int_t size;
zeek_int_t size;
Value** vals;
};
using vec_t = set_t;
struct port_t
{
bro_uint_t port;
zeek_uint_t port;
TransportProto proto;
};
@ -154,8 +154,8 @@ struct Value
* including only the types we can log directly. See IsCompatibleType().
*/
union _val {
bro_int_t int_val;
bro_uint_t uint_val;
zeek_int_t int_val;
zeek_uint_t uint_val;
port_t port_val;
double double_val;
set_t set_val;

4
src/threading/formatters/Ascii.cc
View file

@ -153,7 +153,7 @@ bool Ascii::Describe(ODesc* desc, Value* val, const string& name) const
desc->AddEscapeSequence(separators.set_separator);
for ( bro_int_t j = 0; j < val->val.set_val.size; j++ )
for ( zeek_int_t j = 0; j < val->val.set_val.size; j++ )
{
if ( j > 0 )
desc->AddRaw(separators.set_separator);
@ -180,7 +180,7 @@ bool Ascii::Describe(ODesc* desc, Value* val, const string& name) const
desc->AddEscapeSequence(separators.set_separator);
for ( bro_int_t j = 0; j < val->val.vector_val.size; j++ )
for ( zeek_int_t j = 0; j < val->val.vector_val.size; j++ )
{
if ( j > 0 )
desc->AddRaw(separators.set_separator);

4
src/threading/formatters/JSON.cc
View file

@ -184,7 +184,7 @@ void JSON::BuildJSON(NullDoubleWriter& writer, Value* val, const std::string& na
{
writer.StartArray();
for ( bro_int_t idx = 0; idx < val->val.set_val.size; idx++ )
for ( zeek_int_t idx = 0; idx < val->val.set_val.size; idx++ )
BuildJSON(writer, val->val.set_val.vals[idx]);
writer.EndArray();
@ -195,7 +195,7 @@ void JSON::BuildJSON(NullDoubleWriter& writer, Value* val, const std::string& na
{
writer.StartArray();
for ( bro_int_t idx = 0; idx < val->val.vector_val.size; idx++ )
for ( zeek_int_t idx = 0; idx < val->val.vector_val.size; idx++ )
BuildJSON(writer, val->val.vector_val.vals[idx]);
writer.EndArray();