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/medcli | |
| 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/medcli')
| -rw-r--r-- | src/libcharon/plugins/medcli/medcli_plugin.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/libcharon/plugins/medcli/medcli_plugin.c b/src/libcharon/plugins/medcli/medcli_plugin.c index 6befbf440..30608a01f 100644 --- a/src/libcharon/plugins/medcli/medcli_plugin.c +++ b/src/libcharon/plugins/medcli/medcli_plugin.c @@ -54,10 +54,8 @@ struct private_medcli_plugin_t { medcli_listener_t *listener; }; -/** - * Implementation of plugin_t.destroy - */ -static void destroy(private_medcli_plugin_t *this) +METHOD(plugin_t, destroy, void, + private_medcli_plugin_t *this) { charon->bus->remove_listener(charon->bus, &this->listener->listener); charon->backends->remove_backend(charon->backends, &this->config->backend); @@ -75,9 +73,15 @@ static void destroy(private_medcli_plugin_t *this) plugin_t *medcli_plugin_create() { char *uri; - private_medcli_plugin_t *this = malloc_thing(private_medcli_plugin_t); - - this->public.plugin.destroy = (void(*)(plugin_t*))destroy; + private_medcli_plugin_t *this; + + INIT(this, + .public = { + .plugin = { + .destroy = _destroy, + }, + }, + ); uri = lib->settings->get_str(lib->settings, "medcli.database", NULL); |