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

Merge branch 'master' into topic/jsiwek/broxygen

Browse source
This commit is contained in:
Jon Siwek 2013-10-16 13:34:14 -05:00
commit 47d7d9047b
200 changed files with 2709 additions and 9011 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ID.cc
View file

@ -440,7 +440,6 @@ ID* ID::Unserialize(UnserialInfo* info)
default:
reporter->InternalError("unknown type for UnserialInfo::id_policy");
}
}
@ -543,7 +542,7 @@ bool ID::DoUnserialize(UnserialInfo* info)
}
if ( installed_tmp && ! global_scope()->Remove(name) )
reporter->InternalError("tmp id missing");
reporter->InternalWarning("missing tmp ID in %s unserialization", name);
return true;
}