Migrated sha1_plugin_t to INIT/METHOD macros

2010-12-04 11:26:02 +01:00
parent 72c436c170
commit 79bbe64e17
1 changed files with 10 additions and 6 deletions
@@ -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);