diff options
| author | Martin Willi <martin@revosec.ch> | 2011-04-11 16:41:25 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-04-15 10:07:12 +0200 |
| commit | 6e2791715b7534b601ff5d5163d63d88ad7a8a5e (patch) | |
| tree | 2228f68dd17886b3a8b6bb3a2db2ae92a26570d9 /src/libcharon/plugins/updown/updown_plugin.c | |
| parent | 2b36342551c4d14da6eb29295ebdd60978a2d563 (diff) | |
| download | strongswan-6e2791715b7534b601ff5d5163d63d88ad7a8a5e.tar.bz2 strongswan-6e2791715b7534b601ff5d5163d63d88ad7a8a5e.tar.xz | |
Migrated remaining plugin_t implementations to INIT/METHOD macros
Diffstat (limited to 'src/libcharon/plugins/updown/updown_plugin.c')
| -rw-r--r-- | src/libcharon/plugins/updown/updown_plugin.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/libcharon/plugins/updown/updown_plugin.c b/src/libcharon/plugins/updown/updown_plugin.c index 9d0591e62..8b790cb0f 100644 --- a/src/libcharon/plugins/updown/updown_plugin.c +++ b/src/libcharon/plugins/updown/updown_plugin.c @@ -36,10 +36,8 @@ struct private_updown_plugin_t { updown_listener_t *listener; }; -/** - * Implementation of plugin_t.destroy - */ -static void destroy(private_updown_plugin_t *this) +METHOD(plugin_t, destroy, void, + private_updown_plugin_t *this) { charon->bus->remove_listener(charon->bus, &this->listener->listener); this->listener->destroy(this->listener); @@ -51,11 +49,17 @@ static void destroy(private_updown_plugin_t *this) */ plugin_t *updown_plugin_create() { - private_updown_plugin_t *this = malloc_thing(private_updown_plugin_t); + private_updown_plugin_t *this; - this->public.plugin.destroy = (void(*)(plugin_t*))destroy; + INIT(this, + .public = { + .plugin = { + .destroy = _destroy, + }, + }, + .listener = updown_listener_create(), + ); - this->listener = updown_listener_create(); charon->bus->add_listener(charon->bus, &this->listener->listener); return &this->public.plugin; |