diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-12-04 09:20:53 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-12-04 09:20:53 +0100 |
| commit | cb458beb319e46930a67c27db7ad52e10787d6b6 (patch) | |
| tree | 6de589b5c463c9e9364afc60f09e2179c4c09fe6 | |
| parent | 4bb158c445bb34aeaabca10b93633c31b6d3bc21 (diff) | |
| download | strongswan-cb458beb319e46930a67c27db7ad52e10787d6b6.tar.bz2 strongswan-cb458beb319e46930a67c27db7ad52e10787d6b6.tar.xz | |
Migrated dnskey_plugin_t to INIT/METHOD macros
| -rw-r--r-- | src/libstrongswan/plugins/dnskey/dnskey_plugin.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/libstrongswan/plugins/dnskey/dnskey_plugin.c b/src/libstrongswan/plugins/dnskey/dnskey_plugin.c index bc0ee30ae..d11b149df 100644 --- a/src/libstrongswan/plugins/dnskey/dnskey_plugin.c +++ b/src/libstrongswan/plugins/dnskey/dnskey_plugin.c @@ -31,10 +31,8 @@ struct private_dnskey_plugin_t { dnskey_plugin_t public; }; -/** - * Implementation of dnskey_plugin_t.dnskeytroy - */ -static void destroy(private_dnskey_plugin_t *this) +METHOD(plugin_t, destroy, void, + private_dnskey_plugin_t *this) { lib->creds->remove_builder(lib->creds, (builder_function_t)dnskey_public_key_load); @@ -46,10 +44,15 @@ static void destroy(private_dnskey_plugin_t *this) */ plugin_t *dnskey_plugin_create() { - private_dnskey_plugin_t *this = malloc_thing(private_dnskey_plugin_t); - - this->public.plugin.destroy = (void(*)(plugin_t*))destroy; - + private_dnskey_plugin_t *this; + + INIT(this, + .public = { + .plugin = { + .destroy = _destroy, + }, + }, + ); lib->creds->add_builder(lib->creds, CRED_PUBLIC_KEY, KEY_ANY, FALSE, (builder_function_t)dnskey_public_key_load); lib->creds->add_builder(lib->creds, CRED_PUBLIC_KEY, KEY_RSA, FALSE, |