From 456226acced10d0ff092a85d3c5912925e8b04b2 Mon Sep 17 00:00:00 2001 From: laforge Date: Sat, 24 Apr 2004 23:08:07 +0000 Subject: - use C99 struct initializers --- mysql/ulogd_MYSQL.c | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/mysql/ulogd_MYSQL.c b/mysql/ulogd_MYSQL.c index 74e033b..894098f 100644 --- a/mysql/ulogd_MYSQL.c +++ b/mysql/ulogd_MYSQL.c @@ -65,25 +65,39 @@ static char *stmt_val; static char *stmt_ins; /* our configuration directives */ -static config_entry_t db_ce = { NULL, "db", CONFIG_TYPE_STRING, - CONFIG_OPT_MANDATORY, 0, - { } }; +static config_entry_t db_ce = { + .key = "db", + .type = CONFIG_TYPE_STRING, + .options = CONFIG_OPT_MANDATORY, +}; -static config_entry_t host_ce = { &db_ce, "host", CONFIG_TYPE_STRING, - CONFIG_OPT_MANDATORY, 0, - { } }; +static config_entry_t host_ce = { + .next = &db_ce, + .key = "host", + .type = CONFIG_TYPE_STRING, + .options = CONFIG_OPT_MANDATORY, +}; -static config_entry_t user_ce = { &host_ce, "user", CONFIG_TYPE_STRING, - CONFIG_OPT_MANDATORY, 0, - { } }; +static config_entry_t user_ce = { + .next = &host_ce, + .key = "user", + .type = CONFIG_TYPE_STRING, + .options = CONFIG_OPT_MANDATORY, +}; -static config_entry_t pass_ce = { &user_ce, "pass", CONFIG_TYPE_STRING, - CONFIG_OPT_MANDATORY, 0, - { } }; +static config_entry_t pass_ce = { + .next = &user_ce, + .key = "pass", + .type = CONFIG_TYPE_STRING, + .options = CONFIG_OPT_MANDATORY, +}; -static config_entry_t table_ce = { &pass_ce, "table", CONFIG_TYPE_STRING, - CONFIG_OPT_MANDATORY, 0, - { } }; +static config_entry_t table_ce = { + .next = &pass_ce, + .key = "table", + .type = CONFIG_TYPE_STRING, + .options = CONFIG_OPT_MANDATORY, +}; /* our main output function, called by ulogd */ static int mysql_output(ulog_iret_t *result) -- cgit v1.2.3