X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=688974ba7426a6d3f226a792f7ca452c83548ca9;hp=e7703c16bbe71bd2862fec3239013f4d2aee85b5;hb=a227843b739d279b63adcf3736ebb03d856080c4;hpb=5dde6461a321ee47b06e33f8203f2acf00a31a51

diff --git a/src/conf.c b/src/conf.c
index e7703c16..688974ba 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -53,27 +53,19 @@ static int config_compare(const config_t *a, const config_t *b) {
 }
 
 void init_configuration(avl_tree_t ** config_tree) {
-	cp();
-
 	*config_tree = avl_alloc_tree((avl_compare_t) config_compare, (avl_action_t) free_config);
 }
 
 void exit_configuration(avl_tree_t ** config_tree) {
-	cp();
-
 	avl_delete_tree(*config_tree);
 	*config_tree = NULL;
 }
 
 config_t *new_config(void) {
-	cp();
-
 	return xmalloc_and_zero(sizeof(config_t));
 }
 
 void free_config(config_t *cfg) {
-	cp();
-
 	if(cfg->variable)
 		free(cfg->variable);
 
@@ -87,16 +79,12 @@ void free_config(config_t *cfg) {
 }
 
 void config_add(avl_tree_t *config_tree, config_t *cfg) {
-	cp();
-
 	avl_insert(config_tree, cfg);
 }
 
 config_t *lookup_config(avl_tree_t *config_tree, char *variable) {
 	config_t cfg, *found;
 
-	cp();
-
 	cfg.variable = variable;
 	cfg.file = "";
 	cfg.line = 0;
@@ -116,8 +104,6 @@ config_t *lookup_config_next(avl_tree_t *config_tree, const config_t *cfg) {
 	avl_node_t *node;
 	config_t *found;
 
-	cp();
-
 	node = avl_search_node(config_tree, cfg);
 
 	if(node) {
@@ -133,8 +119,6 @@ config_t *lookup_config_next(avl_tree_t *config_tree, const config_t *cfg) {
 }
 
 bool get_config_bool(const config_t *cfg, bool *result) {
-	cp();
-
 	if(!cfg)
 		return false;
 
@@ -153,8 +137,6 @@ bool get_config_bool(const config_t *cfg, bool *result) {
 }
 
 bool get_config_int(const config_t *cfg, int *result) {
-	cp();
-
 	if(!cfg)
 		return false;
 
@@ -168,8 +150,6 @@ bool get_config_int(const config_t *cfg, int *result) {
 }
 
 bool get_config_string(const config_t *cfg, char **result) {
-	cp();
-
 	if(!cfg)
 		return false;
 
@@ -181,8 +161,6 @@ bool get_config_string(const config_t *cfg, char **result) {
 bool get_config_address(const config_t *cfg, struct addrinfo **result) {
 	struct addrinfo *ai;
 
-	cp();
-
 	if(!cfg)
 		return false;
 
@@ -202,8 +180,6 @@ bool get_config_address(const config_t *cfg, struct addrinfo **result) {
 bool get_config_subnet(const config_t *cfg, subnet_t ** result) {
 	subnet_t subnet = {0};
 
-	cp();
-
 	if(!cfg)
 		return false;
 
@@ -314,8 +290,6 @@ int read_config_file(avl_tree_t *config_tree, const char *fname) {
 	config_t *cfg;
 	size_t bufsize;
 
-	cp();
-
 	fp = fopen(fname, "r");
 
 	if(!fp) {
@@ -397,8 +371,6 @@ bool read_server_config() {
 	char *fname;
 	int x;
 
-	cp();
-
 	xasprintf(&fname, "%s/tinc.conf", confbase);
 	x = read_config_file(config_tree, fname);