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

Migrated database_factory to INIT/METHOD macros

Browse Source
This commit is contained in:
Andreas Steffen
2011-10-02 11:37:50 +02:00
parent 6a9642e466
commit b59fd53fe2
1 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/database/database_factory.c
+19 -26
View File
@@ -41,10 +41,8 @@ struct private_database_factory_t {
mutex_t *mutex; mutex_t *mutex;
}; };
/** METHOD(database_factory_t, create, database_t*,
* Implementation of database_factory_t.create. private_database_factory_t *this, char *uri)
*/
static database_t* create(private_database_factory_t *this, char *uri)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
database_t *database = NULL; database_t *database = NULL;
@@ -65,32 +63,24 @@ static database_t* create(private_database_factory_t *this, char *uri)
return database; return database;
} }
/** METHOD(database_factory_t, add_database, void,
* Implementation of database_factory_t.add_database. private_database_factory_t *this, database_constructor_t create)
*/
static void add_database(private_database_factory_t *this,
database_constructor_t create)
{ {
this->mutex->lock(this->mutex); this->mutex->lock(this->mutex);
this->databases->insert_last(this->databases, create); this->databases->insert_last(this->databases, create);
this->mutex->unlock(this->mutex); this->mutex->unlock(this->mutex);
} }
/** METHOD(database_factory_t, remove_database, void,
* Implementation of database_factory_t.remove_database. private_database_factory_t *this, database_constructor_t create)
*/
static void remove_database(private_database_factory_t *this,
database_constructor_t create)
{ {
this->mutex->lock(this->mutex); this->mutex->lock(this->mutex);
this->databases->remove(this->databases, create, NULL); this->databases->remove(this->databases, create, NULL);
this->mutex->unlock(this->mutex); this->mutex->unlock(this->mutex);
} }
/** METHOD(database_factory_t, destroy, void,
* Implementation of database_factory_t.destroy private_database_factory_t *this)
*/
static void destroy(private_database_factory_t *this)
{ {
this->databases->destroy(this->databases); this->databases->destroy(this->databases);
this->mutex->destroy(this->mutex); this->mutex->destroy(this->mutex);
@@ -102,15 +92,18 @@ static void destroy(private_database_factory_t *this)
*/ */
database_factory_t *database_factory_create() database_factory_t *database_factory_create()
{ {
private_database_factory_t *this = malloc_thing(private_database_factory_t); private_database_factory_t *this;
this->public.create = (database_t*(*)(database_factory_t*, char *url))create; INIT(this,
this->public.add_database = (void(*)(database_factory_t*, database_constructor_t))add_database; .public = {
this->public.remove_database = (void(*)(database_factory_t*, database_constructor_t))remove_database; .create = _create,
this->public.destroy = (void(*)(database_factory_t*))destroy; .add_database = _add_database,
.remove_database = _remove_database,
this->databases = linked_list_create(); .destroy = _destroy,
this->mutex = mutex_create(MUTEX_TYPE_DEFAULT); },
.databases = linked_list_create(),
.mutex = mutex_create(MUTEX_TYPE_DEFAULT),
);
return &this->public; return &this->public;
} }