Merge branch 'master' of ssh://git.bro-ids.org/bro into topic/gilbert/plugin-api-tweak

This commit is contained in:
Gilbert Clark 2015-02-23 00:00:38 -05:00
commit ce18a2867e
253 changed files with 10283 additions and 2678 deletions

View file

@ -335,7 +335,7 @@ int BroFunc::IsPure() const
Val* BroFunc::Call(val_list* args, Frame* parent) const
{
#ifdef PROFILE_BRO_FUNCTIONS
DEBUG_MSG("Function: %s\n", id->Name());
DEBUG_MSG("Function: %s\n", Name());
#endif
SegmentProfiler(segment_logger, location);