diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-12-04 11:40:40 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-12-04 11:40:40 +0100 |
| commit | c742935dac012f6ff9330ce09c3a1ec631e7cd9f (patch) | |
| tree | 5d831c674faa4b23ed66aeb421b738177958ad77 | |
| parent | 1bb67ff8524a0b864eb4d523993f09a643c8a0dc (diff) | |
| download | strongswan-c742935dac012f6ff9330ce09c3a1ec631e7cd9f.tar.bz2 strongswan-c742935dac012f6ff9330ce09c3a1ec631e7cd9f.tar.xz | |
Migrated curl_plugin_t to INIT/METHOD macros
| -rw-r--r-- | src/libstrongswan/plugins/curl/curl_plugin.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/libstrongswan/plugins/curl/curl_plugin.c b/src/libstrongswan/plugins/curl/curl_plugin.c index e00fcfc03..387da03aa 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) |