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

Mark all of the aliased classes in plugin/Plugin.h deprecated, and fix all of the plugins that were using them

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-05-14 17:25:40 -07:00
parent e77e8c4b7b
commit 7a5dae4354
76 changed files with 297 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

5
testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.cc
View file

@ -80,7 +80,7 @@ std::pair<bool, Val*> Plugin::HookCallFunction(const Func* func, Frame* frame, v
/* return {}; */
/* } */
void Plugin::MetaHookPre(HookType hook, const HookArgumentList& args)
void Plugin::MetaHookPre(zeek::plugin::HookType hook, const zeek::plugin::HookArgumentList& args)
{
ODesc d;
d.SetShort();
@ -89,7 +89,8 @@ void Plugin::MetaHookPre(HookType hook, const HookArgumentList& args)
hook_name(hook), d.Description());
}
void Plugin::MetaHookPost(HookType hook, const HookArgumentList& args, HookArgument result)
void Plugin::MetaHookPost(zeek::plugin::HookType hook, const zeek::plugin::HookArgumentList& args,
zeek::plugin::HookArgument result)
{
ODesc d1;
d1.SetShort();

9
testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.h
View file

@ -6,7 +6,7 @@
namespace plugin {
namespace Demo_Hooks {
class Plugin : public ::plugin::Plugin
class Plugin : public zeek::plugin::Plugin
{
protected:
std::pair<bool, Val*> HookCallFunction(const Func* func, Frame* frame, val_list* args) override;
@ -15,8 +15,11 @@ protected:
/* Frame* frame, */
/* zeek::Args* args) override; */
void MetaHookPre(HookType hook, const HookArgumentList& args) override;
void MetaHookPost(HookType hook, const HookArgumentList& args, HookArgument result) override;
void MetaHookPre(zeek::plugin::HookType hook,
const zeek::plugin::HookArgumentList& args) override;
void MetaHookPost(zeek::plugin::HookType hook,
const zeek::plugin::HookArgumentList& args,
zeek::plugin::HookArgument result) override;
// Overridden from plugin::Plugin.
plugin::Configuration Configure() override;