From 246534f3389ba9065a48f547a0604ada89030900 Mon Sep 17 00:00:00 2001 From: "/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org" Date: Sat, 7 Jan 2006 22:05:44 +0000 Subject: remove strerror function of db helpers and move error printing directly into db plugins --- output/mysql/ulogd_output_MYSQL.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'output/mysql/ulogd_output_MYSQL.c') diff --git a/output/mysql/ulogd_output_MYSQL.c b/output/mysql/ulogd_output_MYSQL.c index c8bea50..4484696 100644 --- a/output/mysql/ulogd_output_MYSQL.c +++ b/output/mysql/ulogd_output_MYSQL.c @@ -113,7 +113,8 @@ static int get_columns_mysql(struct ulogd_pluginstance *upi) result = mysql_list_fields(mi->dbh, table_ce(upi->config_kset).u.string, NULL); if (!result) { - ulogd_log(ULOGD_ERROR, "error in list_fields()\n"); + ulogd_log(ULOGD_ERROR, "error in list_fields(): %s\n", + mysql_error(mi->dbh)); return -1; } @@ -191,7 +192,8 @@ static int open_db_mysql(struct ulogd_pluginstance *upi) (const char *) &connect_timeout); if (!mysql_real_connect(mi->dbh, server, user, pass, db, port, NULL, 0)) { - ulogd_log(ULOGD_ERROR, "can't connect to db\n"); + ulogd_log(ULOGD_ERROR, "can't connect to db: %s\n", + mysql_error(mi->dbh)); return -1; } @@ -217,25 +219,21 @@ static int execute_mysql(struct ulogd_pluginstance *upi, int ret; ret = mysql_real_query(mi->dbh, stmt, len); - if (ret) + if (ret) { + ulogd_log(ULOGD_ERROR, "execute failed (%s)\n", + mgsql_error(mi->dbh)); return -1; + } return 0; } -static char *strerror_mysql(struct ulogd_pluginstance *upi) -{ - struct mysql_instance *mi = (struct mysql_instance *) upi->private; - return (char *) mysql_error(mi->dbh); -} - static struct db_driver db_driver_mysql = { .get_columns = &get_columns_mysql, .open_db = &open_db_mysql, .close_db = &close_db_mysql, .escape_string = &escape_string_mysql, .execute = &execute_mysql, - .strerror = &strerror_mysql, }; static int configure_mysql(struct ulogd_pluginstance *upi, -- cgit v1.2.3