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

Merge remote-tracking branch 'origin/topic/johanna/config'

Browse source 
Closes BIT-1900.

* origin/topic/johanna/config:
  Use port_mgr->Get() in the input framework config changes.
  Allow the empty field separator to be empty; use in config framework.
  Fix small bug in config reader.
  Fix segmentation fault when parsing sets containing invalid elements.
  Add config framework.
This commit is contained in:
Robin Sommer 2018-02-06 17:10:36 -08:00
commit fff4db5145
85 changed files with 2156 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Var.cc
View file

@ -139,7 +139,12 @@ static void make_var(ID* id, BroType* t, init_class c, Expr* init,
{
if ( dt == VAR_CONST )
{
id->Error("&persistant/synchronized with constant");
id->Error("&persistent/synchronized with constant");
return;
}
else if ( dt == VAR_OPTION )
{
id->Error("&persistent/synchronized with option");
return;
}
@ -207,6 +212,14 @@ static void make_var(ID* id, BroType* t, init_class c, Expr* init,
id->SetConst();
}
if ( dt == VAR_OPTION )
{
if ( ! init )
id->Error("option variable must be initialized");
id->SetOption();
}
id->UpdateValAttrs();
if ( t && t->Tag() == TYPE_FUNC &&