From 4117d3174e8ae389db9fff2867592fc798a896b2 Mon Sep 17 00:00:00 2001
From: Jonathan McDowell <noodles@earth.li>
Date: Mon, 6 Jun 2016 20:19:17 +0100
Subject: [PATCH] Switch to C99 struct initialisation for default configuration

Inbound changes to the configuration file handling will change the
config structure around. Switch to using C99 style initialisation, which
is much clearer to read and reduces the risk of assigning values to the
wrong configuration variable.
---
 onak-conf.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/onak-conf.c b/onak-conf.c
index 763bdb2..9a8a471 100644
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -37,38 +37,38 @@ extern struct onak_dbctx *DBINIT(bool readonly);
  *	config file.
  */
 struct onak_config config = {
-	128,			/* maxkeys */
-	NULL,			/* thissite */
-	NULL,			/* adminemail */
-	NULL,			/* mta */
-	NULL,			/* syncsites */
-	NULL,			/* logfile */
+	.maxkeys = 128,
+	.thissite = NULL,
+	.adminemail = NULL,
+	.mta = NULL,
+	.syncsites = NULL,
+	.logfile = NULL,
 
-	false,			/* use_keyd */
-	".",			/* sock_dir */
+	.use_keyd = false,
+	.sock_dir = ".",
 
 	/*
 	 * Options for directory backends.
 	 */
-	NULL,			/* db_dir */
+	.db_dir = NULL,
 
 	/*
 	 * Options for the Postgres backend.
 	 */
-	NULL,			/* pg_dbhost */
-	NULL,			/* pg_dbname */
-	NULL,			/* pg_dbuser */
-	NULL,			/* pg_dbpass */
+	.pg_dbhost = NULL,
+	.pg_dbname = NULL,
+	.pg_dbuser = NULL,
+	.pg_dbpass = NULL,
 
 	/*
 	 * Options for dynamic backends.
 	 */
-	NULL,			/* db_backend */
-	NULL,			/* backends_dir */
+	.db_backend = NULL,
+	.backends_dir = NULL,
 
-	DBINIT,			/* Default db initialisation function */
+	.dbinit = DBINIT,
 
-	true,			/* Check packet sig hashes */
+	.check_sighash = true,
 };
 
 bool parsebool(char *str, bool fallback)
-- 
2.39.5