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

Val: RecordVal::LookupWithDefault() returns IntrusivePtr

Browse source
This commit is contained in:
Max Kellermann 2020-03-04 21:27:31 +01:00
parent d180ab0dd2
commit 79570fdfd6
9 changed files with 66 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/file_analysis/File.cc
View file

@ -163,18 +163,14 @@ void File::RaiseFileOverNewConnection(Connection* conn, bool is_orig)
uint64_t File::LookupFieldDefaultCount(int idx) const
{
Val* v = val->LookupWithDefault(idx);
uint64_t rval = v->AsCount();
Unref(v);
return rval;
auto v = val->LookupWithDefault(idx);
return v->AsCount();
}
double File::LookupFieldDefaultInterval(int idx) const
{
Val* v = val->LookupWithDefault(idx);
double rval = v->AsInterval();
Unref(v);
return rval;
auto v = val->LookupWithDefault(idx);
return v->AsInterval();
}
int File::Idx(const string& field, const RecordType* type)

4
src/file_analysis/analyzer/data_event/DataEvent.cc
View file

@ -21,8 +21,8 @@ DataEvent::DataEvent(RecordVal* args, File* file,
file_analysis::Analyzer* DataEvent::Instantiate(RecordVal* args, File* file)
{
Val* chunk_val = args->Lookup("chunk_event");
Val* stream_val = args->Lookup("stream_event");
auto chunk_val = args->Lookup("chunk_event");
auto stream_val = args->Lookup("stream_event");
if ( ! chunk_val && ! stream_val ) return 0;

8
src/file_analysis/analyzer/extract/Extract.cc
View file

@ -32,9 +32,9 @@ Extract::~Extract()
safe_close(fd);
}
static Val* get_extract_field_val(RecordVal* args, const char* name)
static IntrusivePtr<Val> get_extract_field_val(RecordVal* args, const char* name)
{
Val* rval = args->Lookup(name);
auto rval = args->Lookup(name);
if ( ! rval )
reporter->Error("File extraction analyzer missing arg field: %s", name);
@ -44,8 +44,8 @@ static Val* get_extract_field_val(RecordVal* args, const char* name)
file_analysis::Analyzer* Extract::Instantiate(RecordVal* args, File* file)
{
Val* fname = get_extract_field_val(args, "extract_filename");
Val* limit = get_extract_field_val(args, "extract_limit");
auto fname = get_extract_field_val(args, "extract_filename");
auto limit = get_extract_field_val(args, "extract_limit");
if ( ! fname || ! limit )
return 0;

4
src/file_analysis/analyzer/x509/OCSP.cc
View file

@ -32,9 +32,9 @@ using namespace file_analysis;
#define OCSP_STRING_BUF_SIZE 2048
static Val* get_ocsp_type(RecordVal* args, const char* name)
static IntrusivePtr<Val> get_ocsp_type(RecordVal* args, const char* name)
{
Val* rval = args->Lookup(name);
auto rval = args->Lookup(name);
if ( ! rval )
reporter->Error("File extraction analyzer missing arg field: %s", name);