diff options
Diffstat (limited to 'src/libhydra/plugins/attr/attr_plugin.c')
| -rw-r--r-- | src/libhydra/plugins/attr/attr_plugin.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/libhydra/plugins/attr/attr_plugin.c b/src/libhydra/plugins/attr/attr_plugin.c index 24c00bb44..1edb92c1f 100644 --- a/src/libhydra/plugins/attr/attr_plugin.c +++ b/src/libhydra/plugins/attr/attr_plugin.c @@ -36,10 +36,15 @@ struct private_attr_plugin_t { attr_provider_t *provider; }; +<<<<<<< HEAD /** * Implementation of plugin_t.destroy */ static void destroy(private_attr_plugin_t *this) +======= +METHOD(plugin_t, destroy, void, + private_attr_plugin_t *this) +>>>>>>> upstream/4.5.1 { hydra->attributes->remove_provider(hydra->attributes, &this->provider->provider); this->provider->destroy(this->provider); @@ -51,11 +56,24 @@ static void destroy(private_attr_plugin_t *this) */ plugin_t *attr_plugin_create() { +<<<<<<< HEAD private_attr_plugin_t *this = malloc_thing(private_attr_plugin_t); this->public.plugin.destroy = (void(*)(plugin_t*))destroy; this->provider = attr_provider_create(); +======= + private_attr_plugin_t *this; + + INIT(this, + .public = { + .plugin = { + .destroy = _destroy, + }, + }, + .provider = attr_provider_create(), + ); +>>>>>>> upstream/4.5.1 hydra->attributes->add_provider(hydra->attributes, &this->provider->provider); return &this->public.plugin; |