From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Sat, 4 Dec 2010 14:43:04 +0000 (+0100)
Subject: Migrated pubkey_plugin_t to INIT/METHOD macros
X-Git-Tag: 4.5.1~423
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4df49844d951135b22341474c52bdf6f406a6262;p=thirdparty%2Fstrongswan.git

Migrated pubkey_plugin_t to INIT/METHOD macros
---

diff --git a/src/libstrongswan/plugins/pubkey/pubkey_plugin.c b/src/libstrongswan/plugins/pubkey/pubkey_plugin.c
index 6f41ada2a2..cc12217a41 100644
--- a/src/libstrongswan/plugins/pubkey/pubkey_plugin.c
+++ b/src/libstrongswan/plugins/pubkey/pubkey_plugin.c
@@ -31,10 +31,8 @@ struct private_pubkey_plugin_t {
 	pubkey_plugin_t public;
 };
 
-/**
- * Implementation of pubkey_plugin_t.pubkeytroy
- */
-static void destroy(private_pubkey_plugin_t *this)
+METHOD(plugin_t, destroy, void,
+	private_pubkey_plugin_t *this)
 {
 	lib->creds->remove_builder(lib->creds,
 							(builder_function_t)pubkey_cert_wrap);
@@ -46,9 +44,15 @@ static void destroy(private_pubkey_plugin_t *this)
  */
 plugin_t *pubkey_plugin_create()
 {
-	private_pubkey_plugin_t *this = malloc_thing(private_pubkey_plugin_t);
-
-	this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
+	private_pubkey_plugin_t *this;
+
+	INIT(this,
+		.public = {
+			.plugin = {
+				.destroy = _destroy,
+			},
+		},
+	);
 
 	lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_TRUSTED_PUBKEY, FALSE,
 							(builder_function_t)pubkey_cert_wrap);