grab: use grab_client_cmdline_parser_string()

[paraslash.git] / grab_client.c

diff --git a/grab_client.c b/grab_client.c
index 026211fdcb9fca9c6e4e99b635e5de43c8592fb5..e81ad992733b8d0fad16ded17694891513875713 100644 (file)
--- a/grab_client.c
+++ b/grab_client.c
@@ -235,20 +235,14 @@ void activate_inactive_grab_clients(int slot, int audio_format_num,
  * argc, argv get freed when com_grab() returns, so we have to make a
  * copy.
  */
  * argc, argv get freed when com_grab() returns, so we have to make a
  * copy.
  */

-struct grab_client *grab_client_new(int fd, int argc, char **argv, int *err)
+struct grab_client *grab_client_new(int fd, char *line, int *err)

 {
 {

-       int i, ret;
+       int ret;

        struct grab_client *gc = para_calloc(sizeof(struct grab_client));
 
        gc->conf = para_calloc(sizeof(struct grab_client_args_info));
        struct grab_client *gc = para_calloc(sizeof(struct grab_client));
 
        gc->conf = para_calloc(sizeof(struct grab_client_args_info));

-       gc->argc = argc;
-       gc->argv = para_calloc((argc + 2) * sizeof(char *));

 
 

-       for (i = 0; argv[i]; i++) {
-               gc->argv[i] = para_strdup(argv[i]);
-               PARA_INFO_LOG("argc: %d, argv[%d]: %s\n", argc, i, gc->argv[i]);
-       }
-       ret = grab_client_cmdline_parser(gc->argc, gc->argv , gc->conf);
+       ret = grab_client_cmdline_parser_string(line, gc->conf, "grab");

        *err = -E_GC_SYNTAX;
        if (ret)
                goto err_out;
        *err = -E_GC_SYNTAX;
        if (ret)
                goto err_out;


@@ -274,9 +268,6 @@ struct grab_client *grab_client_new(int fd, int argc, char **argv, int *err)
        add_inactive_gc(gc);
        return gc;
 err_out:
        add_inactive_gc(gc);
        return gc;
 err_out:

-       for (i = 0; i < argc; i++)
-               free(gc->argv[i]);
-       free(gc->argv);

        free(gc->conf);
        free(gc);
        return NULL;
        free(gc->conf);
        free(gc);
        return NULL;