Migrated curl_plugin_t to INIT/METHOD macros

This commit is contained in:
Andreas Steffen
2010-12-04 11:40:40 +01:00
parent 1bb67ff852
commit c742935dac
+10 -6
View File
@@ -34,10 +34,8 @@ struct private_curl_plugin_t {
curl_plugin_t public; curl_plugin_t public;
}; };
/** METHOD(plugin_t, destroy, void,
* Implementation of curl_plugin_t.curltroy private_curl_plugin_t *this)
*/
static void destroy(private_curl_plugin_t *this)
{ {
lib->fetcher->remove_fetcher(lib->fetcher, lib->fetcher->remove_fetcher(lib->fetcher,
(fetcher_constructor_t)curl_fetcher_create); (fetcher_constructor_t)curl_fetcher_create);
@@ -51,9 +49,15 @@ static void destroy(private_curl_plugin_t *this)
plugin_t *curl_plugin_create() plugin_t *curl_plugin_create()
{ {
CURLcode res; 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); res = curl_global_init(CURL_GLOBAL_NOTHING);
if (res == CURLE_OK) if (res == CURLE_OK)