Migrated sql_plugin_t to INIT/METHOD macros

diff --git a/src/libcharon/plugins/sql/sql_plugin.c b/src/libcharon/plugins/sql/sql_plugin.c
index 7b0a198d1cfe7f534775af26c602b455cf448ab6..ad1eb91b10136423a7ed7bb008fdf6023117aa30 100644 (file)
--- 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");