]> the.earth.li Git - onak.git/commitdiff
Switch to C99 struct initialisation for default configuration
authorJonathan McDowell <noodles@earth.li>
Mon, 6 Jun 2016 19:19:17 +0000 (20:19 +0100)
committerJonathan McDowell <noodles@earth.li>
Mon, 6 Jun 2016 19:19:17 +0000 (20:19 +0100)
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

index 763bdb203de12b60bd88b3818b75bd76c66672aa..9a8a4713b4f8aea5c548e1641328d1ab68368e8a 100644 (file)
@@ -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)