Fix some typos.

[paraslash.git] / write_common.c

diff --git a/write_common.c b/write_common.c
index ac92bc1a1740d1eeefa50551d03744a6018fce41..b35773f7ff7103fe002e8b23e3be7c128afb9cad 100644 (file)
--- a/write_common.c
+++ b/write_common.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file write_common.c common functions of para_audiod and para_write */
@@ -90,7 +78,7 @@ static void wng_post_select(struct sched *s, struct task *t)
  * \return If at least one open function returned an error, all successful
  * writer notes get closed and this error value is returned. Upon success, a
  * task associated with \a g is registered to the scheduler and the function
- * returnes a positive value.
+ * returns a positive value.
  * */
 int wng_open(struct writer_node_group *g)
 {
@@ -111,6 +99,7 @@ int wng_open(struct writer_node_group *g)
        g->eof = 0;
        return 1;
 err_out:
+       PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
        unregister_task(&g->task);
        while (i > 0) {
                struct writer_node *wn = &g->writer_nodes[--i];
@@ -191,7 +180,7 @@ void init_supported_writers(void)
  * \param writer_num contains the number of the writer upon success
  *
  * This function checks whether \a wa starts with the name of a supported
- * paraslash writer, optinally followed by a colon and any options for that
+ * paraslash writer, optionally followed by a colon and any options for that
  * writer.  If a valid writer name was found and further are present, the
  * remaining part of \a wa is passed to that writer's config parser.
  *
@@ -236,15 +225,9 @@ void *check_writer_arg(const char *wa, int *writer_num)
 struct writer_node_group *setup_default_wng(void)
 {
        struct writer_node_group *wng = wng_new(1);
-       enum writer_enum default_writer;
-
-       if (NUM_SUPPORTED_WRITERS == 1)
-               default_writer = FILE_WRITE;
-       else
-               default_writer = 1;
-       wng->writer_nodes[0].writer = &writers[default_writer];
+       wng->writer_nodes[0].writer = &writers[DEFAULT_WRITER];
        PARA_INFO_LOG("using default writer: %s %p\n",
-               writer_names[default_writer], writers[default_writer].parse_config);
-       wng->writer_nodes[0].conf = writers[default_writer].parse_config("");
+               writer_names[DEFAULT_WRITER], writers[DEFAULT_WRITER].parse_config);
+       wng->writer_nodes[0].conf = writers[DEFAULT_WRITER].parse_config("");
        return wng;
 }