Changeset 272

Timestamp:

04/16/06 17:27:54 (3 years ago)

Author:

alo

Message:

Files:

cherokee/trunk/ChangeLog

r271	r272
1	1	2006-04-16 Alvaro Lopez Ortega <alvaro@alobbs.com>
	2
	3	* cherokee/server.c (cherokee_server_read_config_string): It
	4	doesn't make sente to keep the configuration nodes when the server
	5	start running, so now it frees it as soon as everything is parsed.
	6
	7	* cherokee/config_node.h,
	8	cherokee/config_node.c (cherokee_config_node_new,
	9	cherokee_config_node_free): Added two new method (beside the
	10	stack'ed version _init()/_mrproper()).
2	11
3	12	* cherokee/main_admin.c (config_server): Now it uses the new

r270	r272
43	43
44	44	ret_t
	45	cherokee_config_node_new (cherokee_config_node_t **conf)
	46	{
	47	CHEROKEE_NEW_STRUCT(n,config_node);
	48
	49	cherokee_config_node_init (n);
	50
	51	*conf = n;
	52	return ret_ok;
	53	}
	54
	55
	56	ret_t
45	57	cherokee_config_node_mrproper (cherokee_config_node_t *conf)
46	58	{
	59	list_t i, j;
	60
47	61	cherokee_buffer_mrproper (&conf->key);
48	62	cherokee_buffer_mrproper (&conf->val);
49	63
	64	list_for_each_safe (i, j, &conf->child) {
	65	cherokee_config_node_free (CONFIG_NODE(i));
	66	}
	67
	68	return ret_ok;
	69	}
	70
	71	ret_t
	72	cherokee_config_node_free (cherokee_config_node_t *conf)
	73	{
	74	cherokee_config_node_mrproper (conf);
	75
	76	free (conf);
50	77	return ret_ok;
51	78	}
…	…
68	95	}
69	96
	97
70	98	static cherokee_config_node_t *
71	99	add_new_child (cherokee_config_node_t entry, cherokee_buffer_t key)
72	100	{
	101	ret_t ret;
73	102	cherokee_config_node_t *n;
74	103
75		n = (cherokee_config_node_t *) malloc(sizeof(cherokee_config_node_t));
76		if (unlikely(n==NULL)) return NULL;
77
78		cherokee_config_node_init (n);
	104	ret = cherokee_config_node_new (&n);
	105	if (ret != ret_ok) return NULL;
	106
79	107	cherokee_buffer_add_buffer (&n->key, key);
80	108

r270	r272
52	52	typedef ret_t (* cherokee_config_node_list_func_t) (char , void );
53	53
	54	ret_t cherokee_config_node_new (cherokee_config_node_t **conf);
	55	ret_t cherokee_config_node_free (cherokee_config_node_t *conf);
	56
54	57	ret_t cherokee_config_node_init (cherokee_config_node_t *conf);
55	58	ret_t cherokee_config_node_mrproper (cherokee_config_node_t *conf);

r270	r272
1459	1459	if (ret != ret_ok) return ret;
1460	1460
1461		return configure_server (srv);
	1461	ret = configure_server (srv);
	1462	if (ret != ret_ok) return ret;
	1463
	1464	/* Clean up
	1465	*/
	1466	ret = cherokee_config_node_mrproper (&srv->config);
	1467	if (ret != ret_ok) return ret;
	1468
	1469	return ret_ok;
1462	1470	}
1463	1471
…	…
1472	1480	if (ret != ret_ok) return ret;
1473	1481
1474		return configure_server (srv);
	1482	ret = configure_server (srv);
	1483	if (ret != ret_ok) return ret;
	1484
	1485	/* Clean up
	1486	*/
	1487	ret = cherokee_config_node_mrproper (&srv->config);
	1488	if (ret != ret_ok) return ret;
	1489
	1490	return ret_ok;
1475	1491	}
1476	1492