Introduce create_shifted_argv().

[paraslash.git] / recv_common.c

diff --git a/recv_common.c b/recv_common.c
index 4f157ab5e6ba6f8fa8623b98e072d17c20395b9a..7d7d2b059cd4765dab811d3ace2ea144d4d8f7c8 100644 (file)
--- a/recv_common.c
+++ b/recv_common.c
@@ -33,20 +33,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 +47,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;
 }