Migrated sql_plugin_t to INIT/METHOD macros
This commit is contained in:
@@ -53,10 +53,8 @@ struct private_sql_plugin_t {
|
|||||||
sql_logger_t *logger;
|
sql_logger_t *logger;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
METHOD(plugin_t, destroy, void,
|
||||||
* Implementation of plugin_t.destroy
|
private_sql_plugin_t *this)
|
||||||
*/
|
|
||||||
static void destroy(private_sql_plugin_t *this)
|
|
||||||
{
|
{
|
||||||
charon->backends->remove_backend(charon->backends, &this->config->backend);
|
charon->backends->remove_backend(charon->backends, &this->config->backend);
|
||||||
lib->credmgr->remove_set(lib->credmgr, &this->cred->set);
|
lib->credmgr->remove_set(lib->credmgr, &this->cred->set);
|
||||||
@@ -83,11 +81,15 @@ plugin_t *sql_plugin_create()
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
this = malloc_thing(private_sql_plugin_t);
|
INIT(this,
|
||||||
|
.public = {
|
||||||
|
.plugin = {
|
||||||
|
.destroy = _destroy,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
.db = lib->db->create(lib->db, uri),
|
||||||
|
);
|
||||||
|
|
||||||
this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
|
|
||||||
|
|
||||||
this->db = lib->db->create(lib->db, uri);
|
|
||||||
if (!this->db)
|
if (!this->db)
|
||||||
{
|
{
|
||||||
DBG1(DBG_CFG, "sql plugin failed to connect to database");
|
DBG1(DBG_CFG, "sql plugin failed to connect to database");
|
||||||
|
|||||||
Reference in New Issue
Block a user