denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrated curl_fetcher to INIT/METHOD macros

Browse Source
This commit is contained in:
Martin Willi
2009-12-17 13:53:25 +01:00
parent 1a1ff9d127
commit 83b760cb42
1 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/curl/curl_fetcher.c
+17 -21
View File
@@ -61,10 +61,8 @@ static size_t append(void *ptr, size_t size, size_t nmemb, chunk_t *data)
return realsize; return realsize;
} }
/** METHOD(fetcher_t, fetch, status_t,
* Implements fetcher_t.fetch. private_curl_fetcher_t *this, char *uri, chunk_t *result)
*/
static status_t fetch(private_curl_fetcher_t *this, char *uri, chunk_t *result)
{ {
char error[CURL_ERROR_SIZE]; char error[CURL_ERROR_SIZE];
status_t status; status_t status;
@@ -103,10 +101,8 @@ static status_t fetch(private_curl_fetcher_t *this, char *uri, chunk_t *result)
return status; return status;
} }
/** METHOD(fetcher_t, set_option, bool,
* Implementation of fetcher_t.set_option. private_curl_fetcher_t *this, fetcher_option_t option, ...)
*/
static bool set_option(private_curl_fetcher_t *this, fetcher_option_t option, ...)
{ {
va_list args; va_list args;
@@ -154,10 +150,8 @@ static bool set_option(private_curl_fetcher_t *this, fetcher_option_t option, ..
} }
} }
/** METHOD(fetcher_t, destroy, void,
* Implements fetcher_t.destroy private_curl_fetcher_t *this)
*/
static void destroy(private_curl_fetcher_t *this)
{ {
curl_slist_free_all(this->headers); curl_slist_free_all(this->headers);
curl_easy_cleanup(this->curl); curl_easy_cleanup(this->curl);
@@ -169,20 +163,22 @@ static void destroy(private_curl_fetcher_t *this)
*/ */
curl_fetcher_t *curl_fetcher_create() curl_fetcher_t *curl_fetcher_create()
{ {
private_curl_fetcher_t *this = malloc_thing(private_curl_fetcher_t); private_curl_fetcher_t *this;
this->curl = curl_easy_init(); INIT(this,
if (this->curl == NULL) .public.interface = {
.fetch = _fetch,
.set_option = _set_option,
.destroy = _destroy,
},
.curl = curl_easy_init(),
);
if (!this->curl)
{ {
free(this); free(this);
return NULL; return NULL;
} }
this->headers = NULL;
this->public.interface.fetch = (status_t(*)(fetcher_t*,char*,chunk_t*))fetch;
this->public.interface.set_option = (bool(*)(fetcher_t*, fetcher_option_t option, ...))set_option;
this->public.interface.destroy = (void (*)(fetcher_t*))destroy;
return &this->public; return &this->public;
} }