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

Migrated resolve_plugin_t to INIT/METHOD macros
---

diff --git a/src/libhydra/plugins/resolve/resolve_plugin.c b/src/libhydra/plugins/resolve/resolve_plugin.c
index 502129593b..40ad781ae0 100644
--- a/src/libhydra/plugins/resolve/resolve_plugin.c
+++ b/src/libhydra/plugins/resolve/resolve_plugin.c
@@ -36,10 +36,8 @@ struct private_resolve_plugin_t {
 	resolve_handler_t *handler;
 };
 
-/**
- * Implementation of plugin_t.destroy
- */
-static void destroy(private_resolve_plugin_t *this)
+METHOD(plugin_t, destroy, void,
+	private_resolve_plugin_t *this)
 {
 	hydra->attributes->remove_handler(hydra->attributes, &this->handler->handler);
 	this->handler->destroy(this->handler);
@@ -51,10 +49,16 @@ static void destroy(private_resolve_plugin_t *this)
  */
 plugin_t *resolve_plugin_create()
 {
-	private_resolve_plugin_t *this = malloc_thing(private_resolve_plugin_t);
+	private_resolve_plugin_t *this;
 
-	this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
-	this->handler = resolve_handler_create();
+	INIT(this,
+		.public = {
+			.plugin = {
+				.destroy = _destroy
+			},
+		},
+		.handler = resolve_handler_create(),
+	);
 	hydra->attributes->add_handler(hydra->attributes, &this->handler->handler);
 
 	return &this->public.plugin;