Make configuration validation function return validation error message

Scribery · Mar 27, 2018 · 89e2e02 · 89e2e02
1 parent 16f9a71
commit 89e2e02
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/lib/tlog/play_conf.c b/lib/tlog/play_conf.c
@@ -75,6 +75,9 @@ tlog_play_conf_load(struct tlog_errs **perrs,
     assert(pcmd_help != NULL);
     assert(pconf != NULL);
     assert(argv != NULL);
+    /* Check validate the config */
+    assert(tlog_play_conf_validate(NULL, conf, TLOG_CONF_ORIGIN_ARGS) ==
+            TLOG_RC_OK);
 
     /* Create empty config */
     conf = json_object_new_object();
@@ -136,6 +139,10 @@ tlog_play_conf_load(struct tlog_errs **perrs,
     json_object_put(overlay);
     overlay = NULL;
 
+    /* Check validate the config */
+    assert(tlog_play_conf_validate(NULL, conf, TLOG_CONF_ORIGIN_ARGS) ==
+            TLOG_RC_OK);
+
     grc = TLOG_RC_OK;
     *pcmd_help = cmd_help;
     cmd_help = NULL;

diff --git a/lib/tlog/rec_conf.c b/lib/tlog/rec_conf.c
@@ -175,6 +175,9 @@ tlog_rec_conf_load(struct tlog_errs **perrs,
     assert(pcmd_help != NULL);
     assert(pconf != NULL);
     assert(argv != NULL);
+    /* Check validate the config */
+    assert(tlog_rec_conf_validate(NULL, conf, TLOG_CONF_ORIGIN_ARGS) ==
+            TLOG_RC_OK);
 
     /* Create empty config */
     conf = json_object_new_object();
@@ -250,6 +253,10 @@ tlog_rec_conf_load(struct tlog_errs **perrs,
     json_object_put(overlay);
     overlay = NULL;
 
+    /* Check validate the config */
+    assert(tlog_rec_conf_validate(NULL, conf, TLOG_CONF_ORIGIN_ARGS) ==
+            TLOG_RC_OK);
+
     grc = TLOG_RC_OK;
     *pcmd_help = cmd_help;
     cmd_help = NULL;

diff --git a/lib/tlog/rec_session_conf.c b/lib/tlog/rec_session_conf.c
@@ -189,6 +189,9 @@ tlog_rec_session_conf_load(struct tlog_errs **perrs,
     assert(pcmd_help != NULL);
     assert(pconf != NULL);
     assert(argv != NULL);
+    /* Check validate the config */
+    assert(tlog_rec_session_conf_validate(NULL, conf, TLOG_CONF_ORIGIN_ARGS) ==
+            TLOG_RC_OK);
 
     /* Create empty config */
     conf = json_object_new_object();
@@ -265,6 +268,10 @@ tlog_rec_session_conf_load(struct tlog_errs **perrs,
     json_object_put(overlay);
     overlay = NULL;
 
+    /* Check validate the config */
+    assert(tlog_rec_session_conf_validate(NULL, conf, TLOG_CONF_ORIGIN_ARGS) ==
+            TLOG_RC_OK);
+
     grc = TLOG_RC_OK;
     *pcmd_help = cmd_help;
     cmd_help = NULL;