diff options
Diffstat (limited to 'src/libhydra/plugins/resolve/resolve_plugin.c')
| -rw-r--r-- | src/libhydra/plugins/resolve/resolve_plugin.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/libhydra/plugins/resolve/resolve_plugin.c b/src/libhydra/plugins/resolve/resolve_plugin.c index c60521cd1..d23d36127 100644 --- a/src/libhydra/plugins/resolve/resolve_plugin.c +++ b/src/libhydra/plugins/resolve/resolve_plugin.c @@ -36,15 +36,14 @@ struct private_resolve_plugin_t { resolve_handler_t *handler; }; -<<<<<<< HEAD -/** - * Implementation of plugin_t.destroy - */ -static void destroy(private_resolve_plugin_t *this) -======= +METHOD(plugin_t, get_name, char*, + private_resolve_plugin_t *this) +{ + return "resolve"; +} + METHOD(plugin_t, destroy, void, private_resolve_plugin_t *this) ->>>>>>> upstream/4.5.1 { hydra->attributes->remove_handler(hydra->attributes, &this->handler->handler); this->handler->destroy(this->handler); @@ -56,23 +55,18 @@ METHOD(plugin_t, destroy, void, */ plugin_t *resolve_plugin_create() { -<<<<<<< HEAD - private_resolve_plugin_t *this = malloc_thing(private_resolve_plugin_t); - - this->public.plugin.destroy = (void(*)(plugin_t*))destroy; - this->handler = resolve_handler_create(); -======= private_resolve_plugin_t *this; INIT(this, .public = { .plugin = { + .get_name = _get_name, + .reload = (void*)return_false, .destroy = _destroy, }, }, .handler = resolve_handler_create(), ); ->>>>>>> upstream/4.5.1 hydra->attributes->add_handler(hydra->attributes, &this->handler->handler); return &this->public.plugin; |