From: Andre Noll <maan@systemlinux.org>
Date: Sat, 18 Jul 2009 12:02:13 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~50^2~14
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=4f01c486bb70a27f614cdc9c07a2b8d653db7605;hp=-c

Merge branch 'master' into next
---

4f01c486bb70a27f614cdc9c07a2b8d653db7605
diff --combined dccp_recv.c
index 4d4ac86d,95444588..58c969a2
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@@ -11,7 -11,6 +11,7 @@@
   * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
   */
  
 +#include <regex.h>
  #include <sys/types.h>
  #include <dirent.h>
  
@@@ -158,4 -157,5 +158,5 @@@ void dccp_recv_init(struct receiver *r
  		.short_help = dccp_recv_args_info_help,
  		.detailed_help = dccp_recv_args_info_detailed_help
  	};
+ 	dccp_recv_cmdline_parser_free(&dummy);
  }
diff --combined filter.c
index 99b12217,cc270172..e6c75556
--- a/filter.c
+++ b/filter.c
@@@ -6,9 -6,8 +6,9 @@@
  
  /** \file filter.c The stand-alone filter program. */
  
 -#include "para.h"
 +#include <regex.h>
  
 +#include "para.h"
  #include "filter.cmdline.h"
  #include "list.h"
  #include "sched.h"
@@@ -62,6 -61,15 +62,15 @@@ static void open_filters(void
  	}
  }
  
+ static void free_filter_confs(void)
+ {
+ 	int i;
+ 	struct filter_node *fn;
+ 
+ 	FOR_EACH_FILTER_NODE(fn, fc, i)
+ 		free(fn->conf);
+ }
+ 
  static int init_filter_chain(void)
  {
  	int i, ret;
@@@ -70,7 -78,7 +79,7 @@@
  	if (!conf.filter_given)
  		return -E_NO_FILTERS;
  	fc->num_filters = conf.filter_given;
- 	fc->filter_nodes = para_malloc(fc->num_filters * sizeof(struct filter_node));
+ 	fc->filter_nodes = para_calloc(fc->num_filters * sizeof(struct filter_node));
  	fc->inbufp = &sit->buf;
  	fc->in_loaded = &sit->loaded;
  	fc->input_error = &sit->task.error;
@@@ -93,6 -101,7 +102,7 @@@
  	open_filters();
  	return 1;
  err:
+ 	free_filter_confs();
  	free(fc->filter_nodes);
  	return ret;
  }
@@@ -181,6 -190,7 +191,7 @@@ int main(int argc, char *argv[]
  	s.default_timeout.tv_sec = 1;
  	s.default_timeout.tv_usec = 0;
  	ret = schedule(&s);
+ 	free_filter_confs();
  	close_filters(fc);
  out:
  	free(sit->buf);
diff --combined http_recv.c
index f644233b,7a751e4a..13e9ede2
--- a/http_recv.c
+++ b/http_recv.c
@@@ -6,7 -6,6 +6,7 @@@
  
  /** \file http_recv.c paraslash's http receiver */
  
 +#include <regex.h>
  #include <sys/types.h>
  #include <dirent.h>
  
@@@ -204,4 -203,5 +204,5 @@@ void http_recv_init(struct receiver *r
  		.short_help = http_recv_args_info_help,
  		.detailed_help = http_recv_args_info_detailed_help
  	};
+ 	http_recv_cmdline_parser_free(&dummy);
  }
diff --combined udp_recv.c
index 7bbd4b0c,e4d23404..f9782985
--- a/udp_recv.c
+++ b/udp_recv.c
@@@ -5,7 -5,6 +5,7 @@@
   */
  /** \file udp_recv.c Paraslash's udp receiver */
  
 +#include <regex.h>
  #include <dirent.h>
  #include <sys/socket.h>
  #include <net/if.h>
@@@ -239,4 -238,5 +239,5 @@@ void udp_recv_init(struct receiver *r
  		.short_help = udp_recv_args_info_help,
  		.detailed_help = udp_recv_args_info_detailed_help
  	};
+ 	udp_recv_cmdline_parser_free(&dummy);
  }