From: Andre Noll <maan@systemlinux.org>
Date: Sat, 6 Aug 2011 19:48:22 +0000 (+0200)
Subject: Move setup_writer_node() from write_common.c to write.c.
X-Git-Tag: v0.4.8~4^2~3
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=f2dfd6d47a71433c530773cfbf4039de8b065369;p=paraslash.git

Move setup_writer_node() from write_common.c to write.c.

This function is only called from write.c, so move it there and make
it static.
---

diff --git a/write.c b/write.c
index 6b574414..9762c40c 100644
--- a/write.c
+++ b/write.c
@@ -165,6 +165,41 @@ __noreturn static void print_help_and_die(void)
 	exit(0);
 }
 
+/*
+ * Parse config and register a task for a writer node.
+ *
+ * \param arg Command line arguments.
+ * \param parent The new node will be a child of \a parent.
+ * \param wn The writer node.
+ *
+ * If arg is \p NULL, the OS-dependent default writer is used with no
+ * arguments.  The default writers are alsa for Linux, osx for OS X, oss for
+ * *BSD, and the file writer if the default writer is not supported.
+ *
+ * Once the writer configuration has been retrieved from the ->parse_config
+ * callback a writer node is created, its buffer tree node is added to the
+ * buffer tree as a child of the given parent.
+ *
+ * Finally, the new writer node's task structure is initialized and registered
+ * to the paraslash scheduler.
+ *
+ * \return Standard.
+ */
+static int setup_writer_node(const char *arg, struct btr_node *parent,
+		struct writer_node *wn)
+{
+	if (arg)
+		wn->conf = check_writer_arg(arg, &wn->writer_num);
+	else {
+		wn->writer_num = DEFAULT_WRITER;
+		wn->conf = writers[DEFAULT_WRITER].parse_config_or_die("");
+	}
+	if (!wn->conf)
+		return -E_WRITE_COMMON_SYNTAX;
+	register_writer_node(wn, parent);
+	return 1;
+}
+
 static int main_btr(struct sched *s)
 {
 	int i, ret;
diff --git a/write_common.c b/write_common.c
index faf20749..2c149dfd 100644
--- a/write_common.c
+++ b/write_common.c
@@ -97,41 +97,6 @@ void register_writer_node(struct writer_node *wn, struct btr_node *parent)
 	register_task(&wn->task);
 }
 
-/**
- * Parse config and register a task for a writer node.
- *
- * \param arg Command line arguments.
- * \param parent The new node will be a child of \a parent.
- * \param wn The writer node.
- *
- * If arg is \p NULL, the OS-dependent default writer is used with no
- * arguments.  The default writers are alsa for Linux, osx for OS X, oss for
- * *BSD, and the file writer if the default writer is not supported.
- *
- * Once the writer configuration has been retrieved from the ->parse_config
- * callback a writer node is created, its buffer tree node is added to the
- * buffer tree as a child of the given parent.
- *
- * Finally, the new writer node's task structure is initialized and registered
- * to the paraslash scheduler.
- *
- * \return Standard.
- */
-int setup_writer_node(const char *arg, struct btr_node *parent,
-		struct writer_node *wn)
-{
-	if (arg)
-		wn->conf = check_writer_arg(arg, &wn->writer_num);
-	else {
-		wn->writer_num = DEFAULT_WRITER;
-		wn->conf = writers[DEFAULT_WRITER].parse_config_or_die("");
-	}
-	if (!wn->conf)
-		return -E_WRITE_COMMON_SYNTAX;
-	register_writer_node(wn, parent);
-	return 1;
-}
-
 /**
  * Print the help text of all writers to stdout.
  *
diff --git a/write_common.h b/write_common.h
index 5f55120b..fc702ca0 100644
--- a/write_common.h
+++ b/write_common.h
@@ -10,8 +10,6 @@ void writer_init(void);
 void *check_writer_arg(const char *wa, int *writer_num);
 void print_writer_helps(int detailed);
 void register_writer_node(struct writer_node *wn, struct btr_node *parent);
-int setup_writer_node(const char *arg, struct btr_node *parent,
-		struct writer_node *wn);
 void get_btr_sample_rate(struct btr_node *btrn, int32_t *result);
 void get_btr_channels(struct btr_node *btrn, int32_t *result);
 void get_btr_sample_format(struct btr_node *btrn, int32_t *result);