From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Thu, 25 Nov 2010 22:06:20 +0000 (+0100)
Subject: Migrated kernel_klips_plugin_t to INIT/METHOD macros
X-Git-Tag: 4.5.1~485^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6753bd4a7e3311de58b541d24ec27a9a447b37f;p=thirdparty%2Fstrongswan.git

Migrated kernel_klips_plugin_t to INIT/METHOD macros
---

diff --git a/src/libhydra/plugins/kernel_klips/kernel_klips_plugin.c b/src/libhydra/plugins/kernel_klips/kernel_klips_plugin.c
index 1a22835c00..9ec3316ffb 100644
--- a/src/libhydra/plugins/kernel_klips/kernel_klips_plugin.c
+++ b/src/libhydra/plugins/kernel_klips/kernel_klips_plugin.c
@@ -32,10 +32,8 @@ struct private_kernel_klips_plugin_t {
 	kernel_klips_plugin_t public;
 };
 
-/**
- * Implementation of plugin_t.destroy
- */
-static void destroy(private_kernel_klips_plugin_t *this)
+METHOD(plugin_t, destroy, void,
+	private_kernel_klips_plugin_t *this)
 {
 	hydra->kernel_interface->remove_ipsec_interface(hydra->kernel_interface,
 						(kernel_ipsec_constructor_t)kernel_klips_ipsec_create);
@@ -49,8 +47,13 @@ plugin_t *kernel_klips_plugin_create()
 {
 	private_kernel_klips_plugin_t *this = malloc_thing(private_kernel_klips_plugin_t);
 
-	this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
-
+	INIT(this,
+		.public = {
+			.plugin = {
+				.destroy = _destroy,
+			}
+		}
+	);
 	hydra->kernel_interface->add_ipsec_interface(hydra->kernel_interface,
 						(kernel_ipsec_constructor_t)kernel_klips_ipsec_create);