aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Steffen <andreas.steffen@strongswan.org>2010-11-25 23:14:29 +0100
committerAndreas Steffen <andreas.steffen@strongswan.org>2010-11-25 23:14:29 +0100
commitcd5feee356e4b67b6d276d70f96bd50549dfd2b0 (patch)
tree5c13d11ecacc0d44f7102e2599970273ba4ff506
parent52c037997c5f5785ac35ebcbe935e555746fdfc4 (diff)
downloadstrongswan-cd5feee356e4b67b6d276d70f96bd50549dfd2b0.tar.bz2
strongswan-cd5feee356e4b67b6d276d70f96bd50549dfd2b0.tar.xz
Migrated kernel_pfkey_plugin_t to INIT/METHOD macros
-rw-r--r--src/libhydra/plugins/kernel_pfkey/kernel_pfkey_plugin.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_plugin.c b/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_plugin.c
index 781ba5008..9e7a7904d 100644
--- a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_plugin.c
+++ b/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_plugin.c
@@ -32,10 +32,8 @@ struct private_kernel_pfkey_plugin_t {
kernel_pfkey_plugin_t public;
};
-/**
- * Implementation of plugin_t.destroy
- */
-static void destroy(private_kernel_pfkey_plugin_t *this)
+METHOD(plugin_t, destroy, void,
+ private_kernel_pfkey_plugin_t *this)
{
hydra->kernel_interface->remove_ipsec_interface(hydra->kernel_interface,
(kernel_ipsec_constructor_t)kernel_pfkey_ipsec_create);
@@ -47,10 +45,15 @@ static void destroy(private_kernel_pfkey_plugin_t *this)
*/
plugin_t *kernel_pfkey_plugin_create()
{
- private_kernel_pfkey_plugin_t *this = malloc_thing(private_kernel_pfkey_plugin_t);
-
- this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
-
+ private_kernel_pfkey_plugin_t *this;
+
+ INIT(this,
+ .public = {
+ .plugin = {
+ .destroy = _destroy,
+ },
+ },
+ );
hydra->kernel_interface->add_ipsec_interface(hydra->kernel_interface,
(kernel_ipsec_constructor_t)kernel_pfkey_ipsec_create);