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/eap_simaka_pseudonym | |
| 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/eap_simaka_pseudonym')
| -rw-r--r-- | src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c index 81b9d7b00..c4a1ec255 100644 --- a/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c +++ b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c @@ -42,10 +42,8 @@ struct private_eap_simaka_pseudonym_t { eap_simaka_pseudonym_provider_t *provider; }; -/** - * Implementation of eap_simaka_pseudonym_t.destroy. - */ -static void destroy(private_eap_simaka_pseudonym_t *this) +METHOD(plugin_t, destroy, void, + private_eap_simaka_pseudonym_t *this) { charon->sim->remove_card(charon->sim, &this->card->card); charon->sim->remove_provider(charon->sim, &this->provider->provider); @@ -61,11 +59,15 @@ plugin_t *eap_simaka_pseudonym_plugin_create() { private_eap_simaka_pseudonym_t *this; - this = malloc_thing(private_eap_simaka_pseudonym_t); - - this->public.plugin.destroy = (void(*)(plugin_t*))destroy; + INIT(this, + .public = { + .plugin = { + .destroy = _destroy, + }, + }, + .provider = eap_simaka_pseudonym_provider_create(), + ); - this->provider = eap_simaka_pseudonym_provider_create(); if (!this->provider) { free(this); |