Migrated sha1_plugin_t to INIT/METHOD macros

diff --git a/src/libstrongswan/plugins/sha1/sha1_plugin.c b/src/libstrongswan/plugins/sha1/sha1_plugin.c
index 7b9cf878f5c090a9c4a081145b91308a57d57715..a951bb2317e5cc427753ba4f636a869dbc601f97 100644 (file)
--- a/src/libstrongswan/plugins/sha1/sha1_plugin.c
+++ b/src/libstrongswan/plugins/sha1/sha1_plugin.c
@@ -32,10 +32,8 @@ struct private_sha1_plugin_t {
        sha1_plugin_t public;
 };
 
-/**
- * Implementation of sha1_plugin_t.destroy
- */
-static void destroy(private_sha1_plugin_t *this)
+METHOD(plugin_t, destroy, void,
+       private_sha1_plugin_t *this)
 {
        lib->crypto->remove_hasher(lib->crypto,
                                                           (hasher_constructor_t)sha1_hasher_create);
@@ -49,9 +47,15 @@ static void destroy(private_sha1_plugin_t *this)
  */
 plugin_t *sha1_plugin_create()
 {
-       private_sha1_plugin_t *this = malloc_thing(private_sha1_plugin_t);
+       private_sha1_plugin_t *this;
 
-       this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
+       INIT(this,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
+       );
 
        lib->crypto->add_hasher(lib->crypto, HASH_SHA1,
                                                        (hasher_constructor_t)sha1_hasher_create);