X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv_common.c;h=f899c301e4205070403e885325a1e98f8d0b69ca;hp=9544420bab23bda4d8a742320ec58f56d00a9eca;hb=23b121a85984baa9252f4b4c0b8c4f186e394bb7;hpb=85094cd802bdb606d4e2bf7ed66dec51db2a0953

diff --git a/recv_common.c b/recv_common.c
index 9544420b..f899c301 100644
--- a/recv_common.c
+++ b/recv_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -12,11 +12,9 @@
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "recv.h"
 #include "string.h"
-#include "buffer_tree.h"
-
-DEFINE_RECEIVER_ARRAY;
 
 /**
  * Call the init function of each paraslash receiver.
@@ -33,20 +31,13 @@ static void *parse_receiver_args(int receiver_num, char *options)
 {
 	struct receiver *r = &receivers[receiver_num];
 	char **argv;
-	int argc, i;
+	int argc;
 	void *conf;
 
-
-	PARA_DEBUG_LOG("%s, options: %s\n", r->name,
-		options? options : "(none)");
 	if (options) {
-		PARA_DEBUG_LOG("options: %s\n", options);
-		argc = create_argv(options, " \t", &argv);
+		argc = create_shifted_argv(options, " \t", &argv);
 		if (argc < 0)
 			return NULL;
-		for (i = argc - 1; i >= 0; i--)
-			argv[i + 1] = argv[i];
-		argc++;
 	} else {
 		argc = 1;
 		argv = para_malloc(2 * sizeof(char*));
@@ -54,9 +45,7 @@ static void *parse_receiver_args(int receiver_num, char *options)
 	}
 	argv[0] = make_message("%s_recv", r->name);
 	conf = r->parse_config(argc, argv);
-	for (i = 0; i < argc; i++)
-		free(argv[i]);
-	free(argv);
+	free_argv(argv);
 	return conf;
 }