Migrated sha2_plugin_t to INIT/METHOD macros

This commit is contained in:
Andreas Steffen
2010-12-04 10:48:42 +01:00
parent 4d7e8032ec
commit 72c436c170
+10 -6
View File
@@ -31,10 +31,8 @@ struct private_sha2_plugin_t {
sha2_plugin_t public; sha2_plugin_t public;
}; };
/** METHOD(plugin_t, destroy, void,
* Implementation of sha2_plugin_t.destroy private_sha2_plugin_t *this)
*/
static void destroy(private_sha2_plugin_t *this)
{ {
lib->crypto->remove_hasher(lib->crypto, lib->crypto->remove_hasher(lib->crypto,
(hasher_constructor_t)sha2_hasher_create); (hasher_constructor_t)sha2_hasher_create);
@@ -46,9 +44,15 @@ static void destroy(private_sha2_plugin_t *this)
*/ */
plugin_t *sha2_plugin_create() plugin_t *sha2_plugin_create()
{ {
private_sha2_plugin_t *this = malloc_thing(private_sha2_plugin_t); private_sha2_plugin_t *this;
this->public.plugin.destroy = (void(*)(plugin_t*))destroy; INIT(this,
.public = {
.plugin = {
.destroy = _destroy,
},
},
);
lib->crypto->add_hasher(lib->crypto, HASH_SHA224, lib->crypto->add_hasher(lib->crypto, HASH_SHA224,
(hasher_constructor_t)sha2_hasher_create); (hasher_constructor_t)sha2_hasher_create);