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

Use properly-sized loop variables or convert to ranged-for (bugprone-too-small-loop-variable)

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-02-12 14:56:56 -08:00
parent 94c4c85e82
commit 1248411a2f
22 changed files with 89 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/threading/SerialTypes.cc
View file

@ -107,7 +107,7 @@ Value::~Value()
else if ( type == zeek::TYPE_TABLE )
{
for ( int i = 0; i < val.set_val.size; i++ )
for ( bro_int_t i = 0; i < val.set_val.size; i++ )
delete val.set_val.vals[i];
delete [] val.set_val.vals;
@ -115,7 +115,7 @@ Value::~Value()
else if ( type == zeek::TYPE_VECTOR )
{
for ( int i = 0; i < val.vector_val.size; i++ )
for ( bro_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(SerializationFormat* fmt)
val.set_val.vals = new Value* [val.set_val.size];
for ( int i = 0; i < val.set_val.size; ++i )
for ( bro_int_t i = 0; i < val.set_val.size; ++i )
{
val.set_val.vals[i] = new Value;
@ -304,7 +304,7 @@ bool Value::Read(SerializationFormat* fmt)
val.vector_val.vals = new Value* [val.vector_val.size];
for ( int i = 0; i < val.vector_val.size; ++i )
for ( bro_int_t i = 0; i < val.vector_val.size; ++i )
{
val.vector_val.vals[i] = new Value;

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

@ -155,7 +155,7 @@ bool Ascii::Describe(ODesc* desc, threading::Value* val, const string& name) con
desc->AddEscapeSequence(separators.set_separator);
for ( int j = 0; j < val->val.set_val.size; j++ )
for ( bro_int_t j = 0; j < val->val.set_val.size; j++ )
{
if ( j > 0 )
desc->AddRaw(separators.set_separator);
@ -182,7 +182,7 @@ bool Ascii::Describe(ODesc* desc, threading::Value* val, const string& name) con
desc->AddEscapeSequence(separators.set_separator);
for ( int j = 0; j < val->val.vector_val.size; j++ )
for ( bro_int_t j = 0; j < val->val.vector_val.size; j++ )
{
if ( j > 0 )
desc->AddRaw(separators.set_separator);
@ -360,9 +360,9 @@ threading::Value* Ascii::ParseValue(const string& s, const string& name, zeek::T
{
// how many entries do we have...
unsigned int length = 1;
for ( unsigned int i = 0; i < s.size(); i++ )
for ( const auto& c : s )
{
if ( s[i] == separators.set_separator[0] )
if ( c == separators.set_separator[0] )
length++;
}

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

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