Move Reporter to zeek namespace

This commit is contained in:
Tim Wojtulewicz 2020-07-20 10:57:36 -07:00
parent 7cedd94ee7
commit bfab224d7c
132 changed files with 1010 additions and 987 deletions

View file

@ -120,7 +120,7 @@ void Stmt::DecrBPCount()
if ( breakpoint_count )
--breakpoint_count;
else
reporter->InternalError("breakpoint count decremented below 0");
zeek::reporter->InternalError("breakpoint count decremented below 0");
}
void Stmt::AddTag(ODesc* d) const
@ -279,8 +279,8 @@ ValPtr PrintStmt::DoExec(std::vector<ValPtr> vals,
}
break;
default:
reporter->InternalError("unknown Log::PrintLogType value: %d",
print_log_type);
zeek::reporter->InternalError("unknown Log::PrintLogType value: %d",
print_log_type);
break;
}
@ -745,9 +745,10 @@ bool SwitchStmt::AddCaseLabelValueMapping(const Val* v, int idx)
if ( ! hk )
{
reporter->PushLocation(e->GetLocationInfo());
reporter->InternalError("switch expression type mismatch (%s/%s)",
type_name(v->GetType()->Tag()), type_name(e->GetType()->Tag()));
zeek::reporter->PushLocation(e->GetLocationInfo());
zeek::reporter->InternalError("switch expression type mismatch (%s/%s)",
type_name(v->GetType()->Tag()),
type_name(e->GetType()->Tag()));
}
int* label_idx = case_label_value_map.Lookup(hk.get());
@ -785,9 +786,10 @@ std::pair<int, ID*> SwitchStmt::FindCaseLabelMatch(const Val* v) const
if ( ! hk )
{
reporter->PushLocation(e->GetLocationInfo());
reporter->Error("switch expression type mismatch (%s/%s)",
type_name(v->GetType()->Tag()), type_name(e->GetType()->Tag()));
zeek::reporter->PushLocation(e->GetLocationInfo());
zeek::reporter->Error("switch expression type mismatch (%s/%s)",
type_name(v->GetType()->Tag()),
type_name(e->GetType()->Tag()));
return std::make_pair(-1, nullptr);
}