X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=grab_client.c;h=ee07d875e085a591437465eca3ef330deddc2bc1;hp=6769ee522ef3dfcd7dac66fb0c299c4ee0e37ef7;hb=67f005d3ea1afbc498feddb70977f4c8252351e0;hpb=d7cda933daa35663b2b9b61d62cb514afa37fd18

diff --git a/grab_client.c b/grab_client.c
index 6769ee52..ee07d875 100644
--- 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;
@@ -231,20 +231,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)