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 1

Merge remote-tracking branch 'origin/master' into topic/johanna/remove-serializer

Browse source
This commit is contained in:
Johanna Amann 2019-05-23 07:05:23 -07:00
commit da9bf96242
28 changed files with 991 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/File.cc
View file

@ -114,7 +114,7 @@ const char* BroFile::Name() const
return name;
if ( f == stdin )
return"/dev/stdin";
return "/dev/stdin";
if ( f == stdout )
return "/dev/stdout";
@ -242,8 +242,6 @@ FILE* BroFile::BringIntoCache()
return 0;
}
RaiseOpenEvent();
if ( fseek(f, position, SEEK_SET) < 0 )
{
bro_strerror_r(errno, buf, sizeof(buf));
@ -251,6 +249,7 @@ FILE* BroFile::BringIntoCache()
}
InsertAtBeginning();
RaiseOpenEvent();
return f;
}