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

Remove deprecated attributes.

Browse source 
To be more exact: &encrypt, &mergeable, &rotate_interval, &rotate_size

Also removes no longer used redef-able constants:
log_rotate_interval, log_max_size, log_encryption_key

GH-243
This commit is contained in:
Johanna Amann 2019-05-20 14:04:04 -07:00
parent 0080c5ea09
commit 1ff2894af2
17 changed files with 17 additions and 561 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/Attr.cc
View file

@ -11,11 +11,9 @@ const char* attr_name(attr_tag t)
{
static const char* attr_names[int(NUM_ATTRS)] = {
"&optional", "&default", "&redef",
"&rotate_interval", "&rotate_size",
"&add_func", "&delete_func", "&expire_func",
"&read_expire", "&write_expire", "&create_expire",
"&encrypt",
"&raw_output", "&mergeable", "&priority",
"&raw_output", "&priority",
"&group", "&log", "&error_handler", "&type_column",
"(&tracked)", "&deprecated",
};
@ -357,21 +355,6 @@ void Attributes::CheckAttr(Attr* a)
}
break;
case ATTR_ROTATE_INTERVAL:
if ( type->Tag() != TYPE_FILE )
Error("&rotate_interval only applicable to files");
break;
case ATTR_ROTATE_SIZE:
if ( type->Tag() != TYPE_FILE )
Error("&rotate_size only applicable to files");
break;
case ATTR_ENCRYPT:
if ( type->Tag() != TYPE_FILE )
Error("&encrypt only applicable to files");
break;
case ATTR_EXPIRE_READ:
case ATTR_EXPIRE_WRITE:
case ATTR_EXPIRE_CREATE:
@ -446,11 +429,6 @@ void Attributes::CheckAttr(Attr* a)
Error("&raw_output only applicable to files");
break;
case ATTR_MERGEABLE:
if ( type->Tag() != TYPE_TABLE )
Error("&mergeable only applicable to tables/sets");
break;
case ATTR_PRIORITY:
Error("&priority only applicable to event bodies");
break;