X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=prebuffer_filter.c;h=e1afff5aeef095ddbb68231a877a77c9f33ceb3e;hp=9c6fda56b78430b0f979ec2503299460d00f5212;hb=f652ce6afe7f6fd0e42814505234cbf4321a736e;hpb=9de1287d67c9562e9140c6dc7deb0c01c4e10cc0

diff --git a/prebuffer_filter.c b/prebuffer_filter.c
index 9c6fda56..e1afff5a 100644
--- a/prebuffer_filter.c
+++ b/prebuffer_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -78,23 +78,21 @@ static void prebuffer_post_select(__a_unused struct sched *s, struct task *t)
 
 static int prebuffer_parse_config(int argc, char **argv, void **config)
 {
-	struct prebuffer_filter_args_info *prebuffer_conf
-		= para_calloc(sizeof(*prebuffer_conf));
+	struct prebuffer_filter_args_info *conf = para_calloc(sizeof(*conf));
 	int ret = -E_PREBUFFER_SYNTAX;
 
-	if (prebuffer_cmdline_parser(argc, argv, prebuffer_conf))
-		goto err;
+	prebuffer_filter_cmdline_parser(argc, argv, conf);
 	ret = -ERRNO_TO_PARA_ERROR(EINVAL);
-	if (prebuffer_conf->duration_arg < 0)
+	if (conf->duration_arg < 0)
 		goto err;
-	if (prebuffer_conf->size_arg < 0)
+	if (conf->size_arg < 0)
 		goto err;
-	PARA_NOTICE_LOG("prebuffering %ims, %i bytes\n",
-		prebuffer_conf->duration_arg, prebuffer_conf->size_arg);
-	*config = prebuffer_conf;
+	PARA_NOTICE_LOG("prebuffering %ims, %i bytes\n", conf->duration_arg,
+		conf->size_arg);
+	*config = conf;
 	return 1;
 err:
-	free(prebuffer_conf);
+	free(conf);
 	return ret;
 }
 
@@ -108,7 +106,7 @@ static void prebuffer_open(struct filter_node *fn)
 
 static void prebuffer_free_config(void *conf)
 {
-	prebuffer_cmdline_parser_free(conf);
+	prebuffer_filter_cmdline_parser_free(conf);
 }
 
 /**
@@ -120,7 +118,7 @@ void prebuffer_filter_init(struct filter *f)
 {
 	struct prebuffer_filter_args_info dummy;
 
-	prebuffer_cmdline_parser_init(&dummy);
+	prebuffer_filter_cmdline_parser_init(&dummy);
 	f->open = prebuffer_open;
 	f->close = prebuffer_close;
 	f->parse_config = prebuffer_parse_config;