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 2

Merge remote-tracking branch 'origin/master' into topic/johanna/table-on-change

Browse source
This commit is contained in:
Johanna Amann 2020-02-05 12:41:19 -08:00
commit b6a244f784
384 changed files with 2980 additions and 2320 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/Val.cc
View file

@ -1,6 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#include "zeek-config.h"
#include "Val.h"
#include <sys/types.h>
#include <sys/param.h>
@ -12,10 +13,13 @@
#include <stdio.h>
#include <stdlib.h>
#include "Val.h"
#include "Attr.h"
#include "Net.h"
#include "File.h"
#include "Func.h"
#include "Desc.h"
#include "IntrusivePtr.h"
#include "ID.h"
#include "RE.h"
#include "Scope.h"
#include "NetVar.h"
@ -358,6 +362,14 @@ void Val::ValDescribeReST(ODesc* d) const
}
#ifdef DEBUG
void Val::SetID(ID* id)
{
delete [] bound_id;
bound_id = id ? copy_string(id->Name()) : 0;
}
#endif
bool Val::WouldOverflow(const BroType* from_type, const BroType* to_type, const Val* val)
{
if ( !to_type || !from_type )
@ -2081,6 +2093,11 @@ ListVal* TableVal::ConvertToPureList() const
return ConvertToList((*tl)[0]->Tag());
}
Attr* TableVal::FindAttr(attr_tag t) const
{
return attrs ? attrs->FindAttr(t) : 0;
}
void TableVal::Describe(ODesc* d) const
{
const PDict<TableEntryVal>* tbl = AsTable();