diff options
| author | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org> | 2005-12-15 12:37:58 +0000 |
|---|---|---|
| committer | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org> | 2005-12-15 12:37:58 +0000 |
| commit | edacb6372310667af624ba8c9273aca9e02945f7 (patch) | |
| tree | 96ab73855079d422a147d2ee1f01ec14c78af87b /output/mysql | |
| parent | 524d429a3789c81166affecf3c5b1e93cb32e73d (diff) | |
don't "#include" a .c file but rather compile db.c on it's own
Diffstat (limited to 'output/mysql')
| -rw-r--r-- | output/mysql/Makefile.am | 2 | ||||
| -rw-r--r-- | output/mysql/ulogd_output_MYSQL.c | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/output/mysql/Makefile.am b/output/mysql/Makefile.am index 0e5a827..b6730c0 100644 --- a/output/mysql/Makefile.am +++ b/output/mysql/Makefile.am @@ -4,6 +4,6 @@ LIBS=-lmysqlclient_r pkglib_LTLIBRARIES = ulogd_output_MYSQL.la -ulogd_output_MYSQL_la_SOURCES = ulogd_output_MYSQL.c +ulogd_output_MYSQL_la_SOURCES = ulogd_output_MYSQL.c ../../util/db.c ulogd_output_MYSQL_la_LDFLAGS = -module diff --git a/output/mysql/ulogd_output_MYSQL.c b/output/mysql/ulogd_output_MYSQL.c index 766fdb3..c8bea50 100644 --- a/output/mysql/ulogd_output_MYSQL.c +++ b/output/mysql/ulogd_output_MYSQL.c @@ -47,8 +47,7 @@ #include <mysql/mysql.h> #include <ulogd/ulogd.h> #include <ulogd/conffile.h> - -#include "../../util/db.c" +#include <ulogd/db.h> #ifdef DEBUG_MYSQL #define DEBUGP(x, args...) fprintf(stderr, x, ## args) @@ -245,7 +244,7 @@ static int configure_mysql(struct ulogd_pluginstance *upi, struct db_instance *di = (struct db_instance *) &upi->private; di->driver = &db_driver_mysql; - return configure_db(upi, stack); + return ulogd_db_configure(upi, stack); } static struct ulogd_plugin plugin_mysql = { @@ -261,10 +260,10 @@ static struct ulogd_plugin plugin_mysql = { .config_kset = &kset_mysql, .priv_size = sizeof(struct mysql_instance), .configure = &configure_mysql, - .start = &start_db, - .stop = &stop_db, - .signal = &signal_db, - .interp = &interp_db, + .start = &ulogd_db_start, + .stop = &ulogd_db_stop, + .signal = &ulogd_db_signal, + .interp = &ulogd_db_interp, .version = ULOGD_VERSION, }; |