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

Migrated mysql plugin to INIT/METHOD macros

Browse Source
This commit is contained in:
Andreas Steffen
2010-12-04 10:38:35 +01:00
parent c6fde416c4
commit 4d7e8032ec
2 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/mysql/mysql_database.c
+18 -22
View File
@@ -474,10 +474,8 @@ static bool mysql_enumerator_enumerate(mysql_enumerator_t *this, ...)
return TRUE; return TRUE;
} }
/** METHOD(database_t, query, enumerator_t*,
* Implementation of database_t.query. private_mysql_database_t *this, char *sql, ...)
*/
static enumerator_t* query(private_mysql_database_t *this, char *sql, ...)
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
va_list args; va_list args;
@@ -563,10 +561,8 @@ static enumerator_t* query(private_mysql_database_t *this, char *sql, ...)
return (enumerator_t*)enumerator; return (enumerator_t*)enumerator;
} }
/** METHOD(database_t, execute, int,
* Implementation of database_t.execute. private_mysql_database_t *this, int *rowid, char *sql, ...)
*/
static int execute(private_mysql_database_t *this, int *rowid, char *sql, ...)
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
va_list args; va_list args;
@@ -594,18 +590,14 @@ static int execute(private_mysql_database_t *this, int *rowid, char *sql, ...)
return affected; return affected;
} }
/** METHOD(database_t, get_driver,db_driver_t,
* Implementation of database_t.get_driver private_mysql_database_t *this)
*/
static db_driver_t get_driver(private_mysql_database_t *this)
{ {
return DB_MYSQL; return DB_MYSQL;
} }
/** METHOD(database_t, destroy, void,
* Implementation of database_t.destroy private_mysql_database_t *this)
*/
static void destroy(private_mysql_database_t *this)
{ {
this->pool->destroy_function(this->pool, (void*)conn_destroy); this->pool->destroy_function(this->pool, (void*)conn_destroy);
this->mutex->destroy(this->mutex); this->mutex->destroy(this->mutex);
@@ -677,12 +669,16 @@ mysql_database_t *mysql_database_create(char *uri)
return NULL; return NULL;
} }
this = malloc_thing(private_mysql_database_t); INIT(this,
.public = {
this->public.db.query = (enumerator_t* (*)(database_t *this, char *sql, ...))query; .db = {
this->public.db.execute = (int (*)(database_t *this, int *rowid, char *sql, ...))execute; .query = _query,
this->public.db.get_driver = (db_driver_t(*)(database_t*))get_driver; .execute = _execute,
this->public.db.destroy = (void(*)(database_t*))destroy; .get_driver = _get_driver,
.destroy = _destroy,
},
},
);
if (!parse_uri(this, uri)) if (!parse_uri(this, uri))
{ {
src/libstrongswan/plugins/mysql/mysql_plugin.c
+9 -6
View File
@@ -32,10 +32,8 @@ struct private_mysql_plugin_t {
mysql_plugin_t public; mysql_plugin_t public;
}; };
/** METHOD(plugin_t, destroy, void,
* Implementation of plugin_t.destroy private_mysql_plugin_t *this)
*/
static void destroy(private_mysql_plugin_t *this)
{ {
lib->db->remove_database(lib->db, lib->db->remove_database(lib->db,
(database_constructor_t)mysql_database_create); (database_constructor_t)mysql_database_create);
@@ -56,8 +54,13 @@ plugin_t *mysql_plugin_create()
return NULL; return NULL;
} }
this = malloc_thing(private_mysql_plugin_t); INIT(this,
this->public.plugin.destroy = (void(*)(plugin_t*))destroy; .public = {
.plugin = {
.destroy = _destroy,
},
},
);
lib->db->add_database(lib->db, lib->db->add_database(lib->db,
(database_constructor_t)mysql_database_create); (database_constructor_t)mysql_database_create);