Migrated resolve_plugin_t to INIT/METHOD macros

This commit is contained in:
Andreas Steffen
2010-11-25 23:19:33 +01:00
parent 8ac5fb345f
commit 53e159f111
+11 -7
View File
@@ -36,10 +36,8 @@ struct private_resolve_plugin_t {
resolve_handler_t *handler; resolve_handler_t *handler;
}; };
/** METHOD(plugin_t, destroy, void,
* Implementation of plugin_t.destroy private_resolve_plugin_t *this)
*/
static void destroy(private_resolve_plugin_t *this)
{ {
hydra->attributes->remove_handler(hydra->attributes, &this->handler->handler); hydra->attributes->remove_handler(hydra->attributes, &this->handler->handler);
this->handler->destroy(this->handler); this->handler->destroy(this->handler);
@@ -51,10 +49,16 @@ static void destroy(private_resolve_plugin_t *this)
*/ */
plugin_t *resolve_plugin_create() plugin_t *resolve_plugin_create()
{ {
private_resolve_plugin_t *this = malloc_thing(private_resolve_plugin_t); private_resolve_plugin_t *this;
this->public.plugin.destroy = (void(*)(plugin_t*))destroy; INIT(this,
this->handler = resolve_handler_create(); .public = {
.plugin = {
.destroy = _destroy
},
},
.handler = resolve_handler_create(),
);
hydra->attributes->add_handler(hydra->attributes, &this->handler->handler); hydra->attributes->add_handler(hydra->attributes, &this->handler->handler);
return &this->public.plugin; return &this->public.plugin;