[netfilter-cvslog] r6314 - branches/ulog/ulogd2/util

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-12-12 11:58:21 +0100 (Mon, 12 Dec 2005)
New Revision: 6314

Modified:
   branches/ulog/ulogd2/util/db.c
Log:
schema support fixes


Modified: branches/ulog/ulogd2/util/db.c
===================================================================
--- branches/ulog/ulogd2/util/db.c	2005-12-12 07:26:26 UTC (rev 6313)
+++ branches/ulog/ulogd2/util/db.c	2005-12-12 10:58:21 UTC (rev 6314)
@@ -34,13 +34,14 @@
 			     char *dst, const char *src, unsigned int len);
 	int (*execute)(struct ulogd_pluginstance *upi,
 			const char *stmt, unsigned int len);
-	char (*strerror)(struct ulogd_pluginstance *upi);
+	char *(*strerror)(struct ulogd_pluginstance *upi);
 };
 
 struct db_instance {
 	char *stmt; /* buffer for our insert statement */
 	char *stmt_val; /* pointer to the beginning of the "VALUES" part */
 	char *stmt_ins; /* pointer to current inser position in statement */
+	char *schema;
 	time_t reconnect;
 	int (*interp)(struct ulogd_pluginstance *upi);
 	struct db_driver *driver;
@@ -358,7 +359,7 @@
 
 	/* now we have created our statement, insert it */
 
-	if (di->driver->execute(upi, di->stmt, strlen(di->stmt))) {
+	if (di->driver->execute(upi, di->stmt, strlen(di->stmt)) < 0) {
 		ulogd_log(ULOGD_ERROR, "sql error during insert: %s\n",
 			  di->driver->strerror(upi));
 		return _init_db(upi);