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

Deprecate BroFile::GetFile(), replace with BroFile::Get()

Browse source
This commit is contained in:
Jon Siwek 2020-05-15 17:22:16 -07:00
parent 65aad4922d
commit 599eec297c
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/File.cc
View file

@ -346,16 +346,11 @@ double BroFile::Size()
return s.st_size; return s.st_size;
} }
BroFile* BroFile::GetFile(const char* name) IntrusivePtr<BroFile> BroFile::Get(const char* name)
{ {
for ( const auto &el : open_files ) for ( const auto &el : open_files )
{
if ( el.first == name ) if ( el.first == name )
{ return {NewRef{}, el.second};
Ref(el.second);
return el.second;
}
}
return new BroFile(name, "w"); return make_intrusive<BroFile>(name, "w");
} }

5
src/File.h
View file

@ -63,7 +63,10 @@ public:
static void CloseOpenFiles(); static void CloseOpenFiles();
// Get the file with the given name, opening it if it doesn't yet exist. // Get the file with the given name, opening it if it doesn't yet exist.
static BroFile* GetFile(const char* name); static IntrusivePtr<BroFile> Get(const char* name);
[[deprecated("Remove in v4.1. Use BroFile::Get().")]]
static BroFile* GetFile(const char* name)
{ return Get(name).release(); }
void EnableRawOutput() { raw_output = true; } void EnableRawOutput() { raw_output = true; }
bool IsRawOutput() const { return raw_output; } bool IsRawOutput() const { return raw_output; }

4
src/broker/Data.cc
View file

@ -124,10 +124,10 @@ struct val_converter {
return new StringVal(a.size(), a.data()); return new StringVal(a.size(), a.data());
case TYPE_FILE: case TYPE_FILE:
{ {
auto file = BroFile::GetFile(a.data()); auto file = BroFile::Get(a.data());
if ( file ) if ( file )
return new Val({AdoptRef{}, file}); return new Val(std::move(file));
return nullptr; return nullptr;
} }