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

Merge remote-tracking branch 'origin/topic/timw/clang-tidy'

Browse source 
* origin/topic/timw/clang-tidy:
  Don't specify 0u for initial value of loops changed to size_t
  Use .empty() instead of checking size against zero
  Use properly-sized loop variables or convert to ranged-for (bugprone-too-small-loop-variable)

Merge changes one type over to ptrdiff_t
This commit is contained in:
Johanna Amann 2020-07-30 17:47:44 +00:00
commit 01fa5611ef
24 changed files with 105 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/broker/Manager.cc
View file

@ -843,8 +843,8 @@ bool Manager::Subscribe(const string& topic_prefix)
bool Manager::Forward(string topic_prefix)
{
for ( auto i = 0u; i < forwarded_prefixes.size(); ++i )
if ( forwarded_prefixes[i] == topic_prefix )
for ( const auto& prefix : forwarded_prefixes )
if ( prefix == topic_prefix )
return false;
DBG_LOG(DBG_BROKER, "Forwarding topic prefix %s", topic_prefix.c_str());
@ -855,7 +855,7 @@ bool Manager::Forward(string topic_prefix)
bool Manager::Unsubscribe(const string& topic_prefix)
{
for ( auto i = 0u; i < forwarded_prefixes.size(); ++i )
for ( size_t i = 0; i < forwarded_prefixes.size(); ++i )
if ( forwarded_prefixes[i] == topic_prefix )
{
DBG_LOG(DBG_BROKER, "Unforwading topic prefix %s", topic_prefix.c_str());
@ -1160,10 +1160,8 @@ void Manager::ProcessEvent(const broker::topic& topic, broker::zeek::Event ev)
auto& topic_string = topic.string();
for ( auto i = 0u; i < forwarded_prefixes.size(); ++i )
for ( const auto& p : forwarded_prefixes )
{
auto& p = forwarded_prefixes[i];
if ( p.size() > topic_string.size() )
continue;
@ -1188,7 +1186,7 @@ void Manager::ProcessEvent(const broker::topic& topic, broker::zeek::Event ev)
zeek::Args vl;
vl.reserve(args.size());
for ( auto i = 0u; i < args.size(); ++i )
for ( size_t i = 0; i < args.size(); ++i )
{
auto got_type = args[i].get_type_name();
const auto& expected_type = arg_types[i];
@ -1200,7 +1198,7 @@ void Manager::ProcessEvent(const broker::topic& topic, broker::zeek::Event ev)
{
auto expected_name = zeek::type_name(expected_type->Tag());
reporter->Warning("failed to convert remote event '%s' arg #%d,"
reporter->Warning("failed to convert remote event '%s' arg #%lu,"
" got %s, expected %s",
name.data(), i, got_type,
expected_name);
@ -1263,13 +1261,13 @@ bool bro_broker::Manager::ProcessLogCreate(broker::zeek::LogCreate lc)
auto num_fields = fields_data->size();
auto fields = new threading::Field* [num_fields];
for ( auto i = 0u; i < num_fields; ++i )
for ( size_t i = 0; i < num_fields; ++i )
{
if ( auto field = data_to_threading_field(std::move((*fields_data)[i])) )
fields[i] = field;
else
{
reporter->Warning("failed to convert remote log field # %d", i);
reporter->Warning("failed to convert remote log field # %lu", i);
delete [] fields;
return false;
}