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

Migrated curl_plugin_t to INIT/METHOD macros
---

diff --git a/src/libstrongswan/plugins/curl/curl_plugin.c b/src/libstrongswan/plugins/curl/curl_plugin.c
index e00fcfc039..387da03aac 100644
--- a/src/libstrongswan/plugins/curl/curl_plugin.c
+++ b/src/libstrongswan/plugins/curl/curl_plugin.c
@@ -34,10 +34,8 @@ struct private_curl_plugin_t {
 	curl_plugin_t public;
 };
 
-/**
- * Implementation of curl_plugin_t.curltroy
- */
-static void destroy(private_curl_plugin_t *this)
+METHOD(plugin_t, destroy, void,
+	private_curl_plugin_t *this)
 {
 	lib->fetcher->remove_fetcher(lib->fetcher,
 								 (fetcher_constructor_t)curl_fetcher_create);
@@ -51,9 +49,15 @@ static void destroy(private_curl_plugin_t *this)
 plugin_t *curl_plugin_create()
 {
 	CURLcode res;
-	private_curl_plugin_t *this = malloc_thing(private_curl_plugin_t);
+	private_curl_plugin_t *this;
 
-	this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
+	INIT(this,
+		.public = {
+			.plugin = {
+				.destroy = _destroy,
+			},
+		},
+	);
 
 	res = curl_global_init(CURL_GLOBAL_NOTHING);
 	if (res == CURLE_OK)