Migrated curl_plugin_t to INIT/METHOD macros
authorAndreas Steffen <andreas.steffen@strongswan.org>
Sat, 4 Dec 2010 10:40:40 +0000 (11:40 +0100)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Sat, 4 Dec 2010 10:40:40 +0000 (11:40 +0100)
src/libstrongswan/plugins/curl/curl_plugin.c

index e00fcfc..387da03 100644 (file)
@@ -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)