diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-11-30 23:31:24 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-11-30 23:31:24 +0100 |
| commit | e79567d07eabbbb703a9598413b880cc319c5357 (patch) | |
| tree | 178d9c361e7b998ed2b73454e9ac99cc65975d31 /src/libcharon/plugins/sql/sql_plugin.c | |
| parent | e7f586131e657139d6f9ce7d43e36132786cee2b (diff) | |
| download | strongswan-e79567d07eabbbb703a9598413b880cc319c5357.tar.bz2 strongswan-e79567d07eabbbb703a9598413b880cc319c5357.tar.xz | |
Migrated sql_plugin_t to INIT/METHOD macros
Diffstat (limited to 'src/libcharon/plugins/sql/sql_plugin.c')
| -rw-r--r-- | src/libcharon/plugins/sql/sql_plugin.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/libcharon/plugins/sql/sql_plugin.c b/src/libcharon/plugins/sql/sql_plugin.c index 7b0a198d1..ad1eb91b1 100644 --- a/src/libcharon/plugins/sql/sql_plugin.c +++ b/src/libcharon/plugins/sql/sql_plugin.c @@ -53,10 +53,8 @@ struct private_sql_plugin_t { sql_logger_t *logger; }; -/** - * Implementation of plugin_t.destroy - */ -static void destroy(private_sql_plugin_t *this) +METHOD(plugin_t, destroy, void, + private_sql_plugin_t *this) { charon->backends->remove_backend(charon->backends, &this->config->backend); lib->credmgr->remove_set(lib->credmgr, &this->cred->set); @@ -83,11 +81,15 @@ plugin_t *sql_plugin_create() return NULL; } - this = malloc_thing(private_sql_plugin_t); - - this->public.plugin.destroy = (void(*)(plugin_t*))destroy; + INIT(this, + .public = { + .plugin = { + .destroy = _destroy, + }, + }, + .db = lib->db->create(lib->db, uri), + ); - this->db = lib->db->create(lib->db, uri); if (!this->db) { DBG1(DBG_CFG, "sql plugin failed to connect to database"); |