Migrated dnskey_plugin_t to INIT/METHOD macros

diff --git a/src/libstrongswan/plugins/dnskey/dnskey_plugin.c b/src/libstrongswan/plugins/dnskey/dnskey_plugin.c
index bc0ee30aed3fdd2f76285a96c9456f5fc6aac3e0..d11b149df516751ae2cf55cfceaaa6f0d5bb40c2 100644 (file)
--- 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,