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

Move DebugLogger to zeek namespaces

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-21 14:16:42 -07:00
parent a2a435360a
commit 886fc102b8
40 changed files with 358 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/zeekygen/Manager.cc
View file

@ -24,7 +24,7 @@ static void DbgAndWarn(const char* msg)
return;
zeek::reporter->Warning("%s", msg);
DBG_LOG(DBG_ZEEKYGEN, "%s", msg);
DBG_LOG(zeek::DBG_ZEEKYGEN, "%s", msg);
}
static void WarnMissingScript(const char* type, const zeek::detail::ID* id,
@ -145,7 +145,7 @@ void Manager::Script(const string& path)
ScriptInfo* info = new ScriptInfo(name, path);
scripts.map[name] = info;
all_info.push_back(info);
DBG_LOG(DBG_ZEEKYGEN, "Made ScriptInfo %s", name.c_str());
DBG_LOG(zeek::DBG_ZEEKYGEN, "Made ScriptInfo %s", name.c_str());
if ( ! info->IsPkgLoader() )
return;
@ -162,7 +162,7 @@ void Manager::Script(const string& path)
PackageInfo* pkginfo = new PackageInfo(name);
packages.map[name] = pkginfo;
all_info.push_back(pkginfo);
DBG_LOG(DBG_ZEEKYGEN, "Made PackageInfo %s", name.c_str());
DBG_LOG(zeek::DBG_ZEEKYGEN, "Made PackageInfo %s", name.c_str());
}
void Manager::ScriptDependency(const string& path, const string& dep)
@ -189,7 +189,7 @@ void Manager::ScriptDependency(const string& path, const string& dep)
}
script_info->AddDependency(depname);
DBG_LOG(DBG_ZEEKYGEN, "Added script dependency %s for %s",
DBG_LOG(zeek::DBG_ZEEKYGEN, "Added script dependency %s for %s",
depname.c_str(), name.c_str());
for ( size_t i = 0; i < comment_buffer.size(); ++i )
@ -213,7 +213,7 @@ void Manager::ModuleUsage(const string& path, const string& module)
}
script_info->AddModule(module);
DBG_LOG(DBG_ZEEKYGEN, "Added module usage %s in %s",
DBG_LOG(zeek::DBG_ZEEKYGEN, "Added module usage %s in %s",
module.c_str(), name.c_str());
}
@ -269,7 +269,7 @@ void Manager::StartType(zeek::detail::IDPtr id)
return;
}
DBG_LOG(DBG_ZEEKYGEN, "Making IdentifierInfo (incomplete) %s, in %s",
DBG_LOG(zeek::DBG_ZEEKYGEN, "Making IdentifierInfo (incomplete) %s, in %s",
id->Name(), script.c_str());
incomplete_type = CreateIdentifierInfo(std::move(id), script_info);
}
@ -288,7 +288,7 @@ void Manager::Identifier(zeek::detail::IDPtr id)
{
if ( incomplete_type->Name() == id->Name() )
{
DBG_LOG(DBG_ZEEKYGEN, "Finished document for type %s", id->Name());
DBG_LOG(zeek::DBG_ZEEKYGEN, "Finished document for type %s", id->Name());
incomplete_type->CompletedTypeDecl();
incomplete_type = nullptr;
return;
@ -318,7 +318,7 @@ void Manager::Identifier(zeek::detail::IDPtr id)
{
// Internally-created identifier (e.g. file/proto analyzer enum tags).
// Handled specially since they don't have a script location.
DBG_LOG(DBG_ZEEKYGEN, "Made internal IdentifierInfo %s",
DBG_LOG(zeek::DBG_ZEEKYGEN, "Made internal IdentifierInfo %s",
id->Name());
CreateIdentifierInfo(id, nullptr);
return;
@ -333,7 +333,7 @@ void Manager::Identifier(zeek::detail::IDPtr id)
return;
}
DBG_LOG(DBG_ZEEKYGEN, "Making IdentifierInfo %s, in script %s",
DBG_LOG(zeek::DBG_ZEEKYGEN, "Making IdentifierInfo %s, in script %s",
id->Name(), script.c_str());
CreateIdentifierInfo(std::move(id), script_info);
}
@ -357,7 +357,7 @@ void Manager::RecordField(const zeek::detail::ID* id, const zeek::TypeDecl* fiel
string script = NormalizeScriptPath(path);
idd->AddRecordField(field, script, comment_buffer);
comment_buffer.clear();
DBG_LOG(DBG_ZEEKYGEN, "Document record field %s, identifier %s, script %s",
DBG_LOG(zeek::DBG_ZEEKYGEN, "Document record field %s, identifier %s, script %s",
field->id, id->Name(), script.c_str());
}
@ -395,7 +395,7 @@ void Manager::Redef(const zeek::detail::ID* id, const string& path,
script_info->AddRedef(id_info);
comment_buffer.clear();
last_identifier_seen = id_info;
DBG_LOG(DBG_ZEEKYGEN, "Added redef of %s from %s",
DBG_LOG(zeek::DBG_ZEEKYGEN, "Added redef of %s from %s",
id->Name(), from_script.c_str());
}