X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv_common.c;h=c8f97c9e9d61ef914da8559bf7b10ce6fb3e4542;hp=8f8f63697714904c1d6c871c1e8e3df197e0298e;hb=7b3c325a51b3b5cc2782dfc2e24613d8ecdc5618;hpb=c79899fe6a1e8eb3086749f46c599d9790d99921 diff --git a/recv_common.c b/recv_common.c index 8f8f6369..c8f97c9e 100644 --- a/recv_common.c +++ b/recv_common.c @@ -1,19 +1,7 @@ /* - * Copyright (C) 2006-2007 Andre Noll + * Copyright (C) 2006-2008 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file recv_common.c common functions of para_recv and para_audiod */ @@ -51,12 +39,8 @@ static void *parse_receiver_args(int receiver_num, char *options) argv[1] = NULL; } conf = r->parse_config(argc, argv); - if (!conf) { - for (i = 0; i < argc; i++) - free(argv[i]); - free(argv); - return NULL; - } + free(argv[0]); + free(argv); return conf; } @@ -96,6 +80,6 @@ void *check_receiver_arg(char *ra, int *receiver_num) *receiver_num = j; return parse_receiver_args(j, c? ra + len + 1: NULL); } - PARA_ERROR_LOG("%s", "receiver not found\n"); + PARA_ERROR_LOG("receiver not found\n"); return NULL; }