Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-05 16:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote branch 'origin/master' into topic/robin/logging-internals

Browse source 
Conflicts:
	policy/bro.init
	src/builtin-func.l
This commit is contained in:
Robin Sommer 2011-02-25 16:11:03 -08:00
commit e3b2748fa6
63 changed files with 952 additions and 547 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Var.cc
View file

@ -353,6 +353,18 @@ Val* internal_val(const char* name)
return id->ID_Val();
}
Val* internal_const_val(const char* name)
{
ID* id = lookup_ID(name, GLOBAL_MODULE_NAME);
if ( ! id )
internal_error("internal variable %s missing", name);
if ( ! id->IsConst() )
internal_error("internal variable %s is not constant", name);
return id->ID_Val();
}
Val* opt_internal_val(const char* name)
{
ID* id = lookup_ID(name, GLOBAL_MODULE_NAME);