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

Various smalle tweaks in preparation for merging.

Browse source
This commit is contained in:
Robin Sommer 2013-05-10 19:20:27 -07:00
parent ec50cad9db
commit 7610aa31b6
26 changed files with 236 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/util.cc
View file

@ -1577,14 +1577,18 @@ void bro_init_magic(magic_t* cookie_ptr, int flags)
if ( ! *cookie_ptr )
{
const char* err = magic_error(*cookie_ptr);
if ( ! err ) err = "unknown";
if ( ! err )
err = "unknown";
reporter->InternalError("can't init libmagic: %s", err);
}
else if ( magic_load(*cookie_ptr, database) < 0 )
{
const char* err = magic_error(*cookie_ptr);
if ( ! err ) err = "unknown";
if ( ! err )
err = "unknown";
const char* db_name = database ? database : "<default>";
reporter->InternalError("can't load magic file %s: %s", db_name, err);
magic_close(*cookie_ptr);