Migrated fetcher_manager to INIT/METHOD macros

diff --git a/src/libstrongswan/fetcher/fetcher_manager.c b/src/libstrongswan/fetcher/fetcher_manager.c
index b007c8b080b137fc4c326e8537b50b24a6d67ca1..7e49be4dc7c4b0ffa4049f3589675df74e031079 100644 (file)
--- a/src/libstrongswan/fetcher/fetcher_manager.c
+++ b/src/libstrongswan/fetcher/fetcher_manager.c
@@ -58,11 +58,8 @@ static void entry_destroy(entry_t *entry)
        free(entry);
 }
 
-/**
- * Implementation of fetcher_manager_t.fetch.
- */
-static status_t fetch(private_fetcher_manager_t *this,
-                                         char *url, chunk_t *response, ...)
+METHOD(fetcher_manager_t, fetch, status_t,
+       private_fetcher_manager_t *this, char *url, chunk_t *response, ...)
 {
        enumerator_t *enumerator;
        status_t status = NOT_SUPPORTED;
@@ -139,27 +136,22 @@ static status_t fetch(private_fetcher_manager_t *this,
        return status;
 }
 
-/**
- * Implementation of fetcher_manager_t.add_fetcher.
- */
-static void add_fetcher(private_fetcher_manager_t *this,
-                                               fetcher_constructor_t create, char *url)
+METHOD(fetcher_manager_t, add_fetcher, void,
+       private_fetcher_manager_t *this, fetcher_constructor_t create, char *url)
 {
-       entry_t *entry = malloc_thing(entry_t);
-
-       entry->url = strdup(url);
-       entry->create = create;
+       entry_t *entry;
 
+       INIT(entry,
+               .url = strdup(url),
+               .create = create,
+       );
        this->lock->write_lock(this->lock);
        this->fetchers->insert_last(this->fetchers, entry);
        this->lock->unlock(this->lock);
 }
 
-/**
- * Implementation of fetcher_manager_t.remove_fetcher.
- */
-static void remove_fetcher(private_fetcher_manager_t *this,
-                                                  fetcher_constructor_t create)
+METHOD(fetcher_manager_t, remove_fetcher, void,
+       private_fetcher_manager_t *this, fetcher_constructor_t create)
 {
        enumerator_t *enumerator;
        entry_t *entry;
@@ -178,10 +170,8 @@ static void remove_fetcher(private_fetcher_manager_t *this,
        this->lock->unlock(this->lock);
 }
 
-/**
- * Implementation of fetcher_manager_t.destroy
- */
-static void destroy(private_fetcher_manager_t *this)
+METHOD(fetcher_manager_t, destroy, void,
+       private_fetcher_manager_t *this)
 {
        this->fetchers->destroy_function(this->fetchers, (void*)entry_destroy);
        this->lock->destroy(this->lock);
@@ -193,15 +183,18 @@ static void destroy(private_fetcher_manager_t *this)
  */
 fetcher_manager_t *fetcher_manager_create()
 {
-       private_fetcher_manager_t *this = malloc_thing(private_fetcher_manager_t);
-
-       this->public.fetch = (status_t(*)(fetcher_manager_t*, char *url, chunk_t *response, ...))fetch;
-       this->public.add_fetcher = (void(*)(fetcher_manager_t*, fetcher_constructor_t,char*))add_fetcher;
-       this->public.remove_fetcher = (void(*)(fetcher_manager_t*, fetcher_constructor_t))remove_fetcher;
-       this->public.destroy = (void(*)(fetcher_manager_t*))destroy;
-
-       this->fetchers = linked_list_create();
-       this->lock = rwlock_create(RWLOCK_TYPE_DEFAULT);
+       private_fetcher_manager_t *this;
+
+       INIT(this,
+               .public = {
+                       .fetch = _fetch,
+                       .add_fetcher = _add_fetcher,
+                       .remove_fetcher = _remove_fetcher,
+                       .destroy = _destroy,
+               },
+               .fetchers = linked_list_create(),
+               .lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
+       );
 
        return &this->public;
 }