From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Sat, 4 Dec 2010 08:25:22 +0000 (+0100)
Subject: Migrated pem_plugin_t to INIT/METHOD macros
X-Git-Tag: 4.5.1~435
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a76f6ded22b8c68c4862dff19f4564e3d61f607;p=thirdparty%2Fstrongswan.git

Migrated pem_plugin_t to INIT/METHOD macros
---

diff --git a/src/libstrongswan/plugins/pem/pem_plugin.c b/src/libstrongswan/plugins/pem/pem_plugin.c
index 83efb155bb..f2415a3186 100644
--- a/src/libstrongswan/plugins/pem/pem_plugin.c
+++ b/src/libstrongswan/plugins/pem/pem_plugin.c
@@ -33,10 +33,8 @@ struct private_pem_plugin_t {
 	pem_plugin_t public;
 };
 
-/**
- * Implementation of pem_plugin_t.pemtroy
- */
-static void destroy(private_pem_plugin_t *this)
+METHOD(plugin_t, destroy, void,
+	private_pem_plugin_t *this)
 {
 	lib->creds->remove_builder(lib->creds,
 							   (builder_function_t)pem_private_key_load);
@@ -52,9 +50,15 @@ static void destroy(private_pem_plugin_t *this)
  */
 plugin_t *pem_plugin_create()
 {
-	private_pem_plugin_t *this = malloc_thing(private_pem_plugin_t);
-
-	this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
+	private_pem_plugin_t *this;
+
+	INIT(this,
+		.public = {
+			.plugin = {
+				.destroy = _destroy,
+			},
+		},
+	);
 
 	/* register private key PEM decoding builders */
 	lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_ANY, FALSE,