new codename, reset version to git

[paraslash.git] / grab_client.c

diff --git a/grab_client.c b/grab_client.c
index 6769ee522ef3dfcd7dac66fb0c299c4ee0e37ef7..026211fdcb9fca9c6e4e99b635e5de43c8592fb5 100644 (file)
--- a/grab_client.c
+++ b/grab_client.c
@@ -43,7 +43,7 @@ static int max_num_filters(void)
        for (i = 0; audio_formats[i]; i++) {
                PARA_INFO_LOG("%s filter chain length: %d\n", audio_formats[i],
                        num_filters(i));
-               ret = MAX(ret, num_filters(i));
+               ret = PARA_MAX(ret, num_filters(i));
        }
        PARA_INFO_LOG("maximal filter chain length: %d\n", ret);
        return ret;
@@ -85,6 +85,7 @@ rewrite:
        return ret;
 }
 
+/* TODO: gengetopt can handle the grab client modes */
 static int check_gc_args(struct grab_client *gc)
 {
        int i;
@@ -95,7 +96,10 @@ static int check_gc_args(struct grab_client *gc)
        for (i = 0; mv[i]; i++)
                if (!strcmp(conf->mode_arg, mv[i]))
                        break;
+       if (!mv[i])
+               return -E_GC_SYNTAX;
        gc->mode = i;
+       gc->audio_format_num = -1;
        if (conf->audio_format_given) {
                gc->audio_format_num = get_audio_format_num(conf->audio_format_arg);
                if (gc->audio_format_num < 0)
@@ -231,20 +235,19 @@ 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.
  */
-__malloc struct grab_client *grab_client_new(int fd, int argc, char **argv, int *err)
+struct grab_client *grab_client_new(int fd, int argc, char **argv, int *err)
 {
        int i, ret;
        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 + 1) * sizeof(char *));
+       gc->argv = para_calloc((argc + 2) * sizeof(char *));
 
-       for (i = 0; i < argc; i++) {
+       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]);
        }
-       PARA_INFO_LOG("argv[%d]: %s\n", argc, gc->argv[argc]);
        ret = grab_client_cmdline_parser(gc->argc, gc->argv , gc->conf);
        *err = -E_GC_SYNTAX;
        if (ret)