Migrated sql_logger_t to INIT/METHOD macros.

This commit is contained in:
Tobias Brunner
2011-10-04 10:21:25 +02:00
parent d7c552a25e
commit 4f9dc66be2
+17 -19
View File
@@ -47,11 +47,9 @@ struct private_sql_logger_t {
bool recursive; bool recursive;
}; };
/** METHOD(listener_t, log_, bool,
* Implementation of bus_listener_t.log. private_sql_logger_t *this, debug_t group, level_t level, int thread,
*/ ike_sa_t* ike_sa, char *format, va_list args)
static bool log_(private_sql_logger_t *this, debug_t group, level_t level,
int thread, ike_sa_t* ike_sa, char *format, va_list args)
{ {
if (this->recursive) if (this->recursive)
{ {
@@ -115,10 +113,8 @@ static bool log_(private_sql_logger_t *this, debug_t group, level_t level,
return TRUE; return TRUE;
} }
/** METHOD(sql_logger_t, destroy, void,
* Implementation of sql_logger_t.destroy. private_sql_logger_t *this)
*/
static void destroy(private_sql_logger_t *this)
{ {
free(this); free(this);
} }
@@ -128,17 +124,19 @@ static void destroy(private_sql_logger_t *this)
*/ */
sql_logger_t *sql_logger_create(database_t *db) sql_logger_t *sql_logger_create(database_t *db)
{ {
private_sql_logger_t *this = malloc_thing(private_sql_logger_t); private_sql_logger_t *this;
memset(&this->public.listener, 0, sizeof(listener_t)); INIT(this,
this->public.listener.log = (bool(*)(listener_t*,debug_t,level_t,int,ike_sa_t*,char*,va_list))log_; .public = {
this->public.destroy = (void(*)(sql_logger_t*))destroy; .listener = {
.log = _log_,
this->db = db; },
this->recursive = FALSE; .destroy = _destroy,
},
this->level = lib->settings->get_int(lib->settings, .db = db,
"charon.plugins.sql.loglevel", -1); .level = lib->settings->get_int(lib->settings,
"charon.plugins.sql.loglevel", -1),
);
return &this->public; return &this->public;
} }