Migrated dnskey_plugin_t to INIT/METHOD macros

This commit is contained in:
Andreas Steffen
2010-12-04 09:20:53 +01:00
parent 4bb158c445
commit cb458beb31
@@ -31,10 +31,8 @@ struct private_dnskey_plugin_t {
dnskey_plugin_t public; dnskey_plugin_t public;
}; };
/** METHOD(plugin_t, destroy, void,
* Implementation of dnskey_plugin_t.dnskeytroy private_dnskey_plugin_t *this)
*/
static void destroy(private_dnskey_plugin_t *this)
{ {
lib->creds->remove_builder(lib->creds, lib->creds->remove_builder(lib->creds,
(builder_function_t)dnskey_public_key_load); (builder_function_t)dnskey_public_key_load);
@@ -46,10 +44,15 @@ static void destroy(private_dnskey_plugin_t *this)
*/ */
plugin_t *dnskey_plugin_create() plugin_t *dnskey_plugin_create()
{ {
private_dnskey_plugin_t *this = malloc_thing(private_dnskey_plugin_t); private_dnskey_plugin_t *this;
this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
INIT(this,
.public = {
.plugin = {
.destroy = _destroy,
},
},
);
lib->creds->add_builder(lib->creds, CRED_PUBLIC_KEY, KEY_ANY, FALSE, lib->creds->add_builder(lib->creds, CRED_PUBLIC_KEY, KEY_ANY, FALSE,
(builder_function_t)dnskey_public_key_load); (builder_function_t)dnskey_public_key_load);
lib->creds->add_builder(lib->creds, CRED_PUBLIC_KEY, KEY_RSA, FALSE, lib->creds->add_builder(lib->creds, CRED_PUBLIC_KEY, KEY_RSA, FALSE,