write: Simplify config parsers.

[paraslash.git] / write_common.c

diff --git a/write_common.c b/write_common.c
index 6cd7ed22cabf94eafdfd5019b06d366262378c5e..5352356b5835ea5e398392332447a7188fe50444 100644 (file)
--- a/write_common.c
+++ b/write_common.c
@@ -66,10 +66,10 @@ void *check_writer_arg(const char *wa, int *writer_num)
                c = wa[len];
                if (c && c != ' ')
                        continue;
-               if (c && !writers[i].parse_config)
+               if (c && !writers[i].parse_config_or_die)
                        return NULL;
                *writer_num = i;
-               return writers[i].parse_config(c? wa + len + 1 : "");
+               return writers[i].parse_config_or_die(c? wa + len + 1 : "");
        }
        PARA_ERROR_LOG("writer not found\n");
        return NULL;
@@ -115,7 +115,7 @@ int setup_writer_node(const char *arg, struct btr_node *parent,
                wn->conf = check_writer_arg(arg, &wn->writer_num);
        else {
                wn->writer_num = DEFAULT_WRITER;
-               wn->conf = writers[DEFAULT_WRITER].parse_config("");
+               wn->conf = writers[DEFAULT_WRITER].parse_config_or_die("");
        }
        if (!wn->conf)
                return -E_WRITE_COMMON_SYNTAX;
@@ -123,7 +123,6 @@ int setup_writer_node(const char *arg, struct btr_node *parent,
        return 1;
 }
 
-
 /**
  * Print the help text of all writers to stdout.
  *
@@ -163,7 +162,7 @@ static void get_btr_value(struct btr_node *btrn, const char *cmd,
  * Ask parent btr nodes for the sample rate of the current stream.
  *
  * \param btrn Where to start the search.
- * \param result. Filled in by this function.
+ * \param result Filled in by this function.
  *
  * This function is assumed to succeed and terminates on errors.
  */