diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-12-04 15:43:04 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-12-04 15:43:04 +0100 |
| commit | 4df49844d951135b22341474c52bdf6f406a6262 (patch) | |
| tree | fe04efb35ef1efc4a8bd9c6b2ab005574fec6c21 /src | |
| parent | dd621140d30439afda67a6eaf6bdec44227d5f67 (diff) | |
| download | strongswan-4df49844d951135b22341474c52bdf6f406a6262.tar.bz2 strongswan-4df49844d951135b22341474c52bdf6f406a6262.tar.xz | |
Migrated pubkey_plugin_t to INIT/METHOD macros
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstrongswan/plugins/pubkey/pubkey_plugin.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/libstrongswan/plugins/pubkey/pubkey_plugin.c b/src/libstrongswan/plugins/pubkey/pubkey_plugin.c index 6f41ada2a..cc12217a4 100644 --- a/src/libstrongswan/plugins/pubkey/pubkey_plugin.c +++ b/src/libstrongswan/plugins/pubkey/pubkey_plugin.c @@ -31,10 +31,8 @@ struct private_pubkey_plugin_t { pubkey_plugin_t public; }; -/** - * Implementation of pubkey_plugin_t.pubkeytroy - */ -static void destroy(private_pubkey_plugin_t *this) +METHOD(plugin_t, destroy, void, + private_pubkey_plugin_t *this) { lib->creds->remove_builder(lib->creds, (builder_function_t)pubkey_cert_wrap); @@ -46,9 +44,15 @@ static void destroy(private_pubkey_plugin_t *this) */ plugin_t *pubkey_plugin_create() { - private_pubkey_plugin_t *this = malloc_thing(private_pubkey_plugin_t); - - this->public.plugin.destroy = (void(*)(plugin_t*))destroy; + private_pubkey_plugin_t *this; + + INIT(this, + .public = { + .plugin = { + .destroy = _destroy, + }, + }, + ); lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_TRUSTED_PUBKEY, FALSE, (builder_function_t)pubkey_cert_wrap); |