summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlaforge <laforge>2004-04-24 23:08:07 +0000
committerlaforge <laforge>2004-04-24 23:08:07 +0000
commita27347a40ac58af18687bd94ff2b44271fe2a778 (patch)
tree8a53e8bac604804dbf82aee905b637fc77ea6926
parentaf9a7fa7a5d908600449714c9aa8c34e7c0caee4 (diff)
- use C99 struct initializers
-rw-r--r--ulogd/mysql/ulogd_MYSQL.c44
1 files changed, 29 insertions, 15 deletions
diff --git a/ulogd/mysql/ulogd_MYSQL.c b/ulogd/mysql/ulogd_MYSQL.c
index 74e033b..894098f 100644
--- a/ulogd/mysql/ulogd_MYSQL.c
+++ b/ulogd/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)