Whitespace changes.

This commit is contained in:
Robin Sommer 2018-05-18 23:11:30 +00:00
parent 593000be57
commit eaf5f4a9bb
6 changed files with 16 additions and 16 deletions

View file

@ -1,5 +1,5 @@
2.5-576 | 2018-05-17 00:54:28 +0000 2.5-587 | 2018-05-21 18:02:23 +0000
* Switch Bro's communication over to Broker; deprecate the old * Switch Bro's communication over to Broker; deprecate the old
communication system, including Broccoli. See NEWS for more. communication system, including Broccoli. See NEWS for more.

View file

@ -1 +1 @@
2.5-585 2.5-587

View file

@ -113,7 +113,7 @@ TraversalCode Scope::Traverse(TraversalCallback* cb) const
ID* lookup_ID(const char* name, const char* curr_module, bool no_global, ID* lookup_ID(const char* name, const char* curr_module, bool no_global,
bool same_module_only, bool check_export) bool same_module_only, bool check_export)
{ {
string fullname = make_full_var_name(curr_module, name); string fullname = make_full_var_name(curr_module, name);

View file

@ -64,8 +64,8 @@ extern bool in_debug;
// If no_global is true, don't search in the default "global" namespace. // If no_global is true, don't search in the default "global" namespace.
// This passed ownership of a ref'ed ID to the caller. // This passed ownership of a ref'ed ID to the caller.
extern ID* lookup_ID(const char* name, const char* module, extern ID* lookup_ID(const char* name, const char* module,
bool no_global = false, bool same_module_only = false, bool no_global = false, bool same_module_only = false,
bool check_export = true); bool check_export = true);
extern ID* install_ID(const char* name, const char* module_name, extern ID* install_ID(const char* name, const char* module_name,
bool is_global, bool is_export); bool is_global, bool is_export);

View file

@ -226,16 +226,16 @@ void ProfileLogger::Log()
auto cs = broker_mgr->GetStatistics(); auto cs = broker_mgr->GetStatistics();
file->Write(fmt("%0.6f Comm: peers=%zu stores=%zu " file->Write(fmt("%0.6f Comm: peers=%zu stores=%zu "
"pending_queries=%zu " "pending_queries=%zu "
"events_in=%zu events_out=%zu " "events_in=%zu events_out=%zu "
"logs_in=%zu logs_out=%zu " "logs_in=%zu logs_out=%zu "
"ids_in=%zu ids_out=%zu ", "ids_in=%zu ids_out=%zu ",
network_time, cs.num_peers, cs.num_stores, network_time, cs.num_peers, cs.num_stores,
cs.num_pending_queries, cs.num_pending_queries,
cs.num_events_incoming, cs.num_events_outgoing, cs.num_events_incoming, cs.num_events_outgoing,
cs.num_logs_incoming, cs.num_logs_outgoing, cs.num_logs_incoming, cs.num_logs_outgoing,
cs.num_ids_incoming, cs.num_ids_outgoing cs.num_ids_incoming, cs.num_ids_outgoing
)); ));
// Script-level state. // Script-level state.
unsigned int size, mem = 0; unsigned int size, mem = 0;

View file

@ -915,7 +915,7 @@ std::pair<int, ID*> SwitchStmt::FindCaseLabelMatch(const Val* v) const
{ {
reporter->PushLocation(e->GetLocationInfo()); reporter->PushLocation(e->GetLocationInfo());
reporter->Error("switch expression type mismatch (%s/%s)", reporter->Error("switch expression type mismatch (%s/%s)",
type_name(v->Type()->Tag()), type_name(e->Type()->Tag())); type_name(v->Type()->Tag()), type_name(e->Type()->Tag()));
return std::make_pair(-1, nullptr); return std::make_pair(-1, nullptr);
} }