Changeset 289

Timestamp:

06/04/06 18:14:10 (3 years ago)

Author:

alo

Message:

Files:

cherokee/trunk/cherokee/config_entry.c

r283	r289
73	73
74	74	ret_t
75		cherokee_config_entry_~~free~~ (cherokee_config_entry_t *entry)
	75	cherokee_config_entry_mrproper (cherokee_config_entry_t *entry)
76	76	{
77	77	if (entry->handler_properties != NULL) {
…	…
105	105	}
106	106
107
	107	return ret_ok;
	108	}
	109
	110
	111	ret_t
	112	cherokee_config_entry_free (cherokee_config_entry_t *entry)
	113	{
	114	cherokee_config_entry_mrproper (entry);
108	115	free (entry);
	116
109	117	return ret_ok;
110	118	}

r277	r289
69	69
70	70
71		ret_t cherokee_config_entry_new (cherokee_config_entry_t **entry);
72		ret_t cherokee_config_entry_free (cherokee_config_entry_t *entry);
73		ret_t cherokee_config_entry_init (cherokee_config_entry_t *entry);
	71	ret_t cherokee_config_entry_new (cherokee_config_entry_t **entry);
	72	ret_t cherokee_config_entry_free (cherokee_config_entry_t *entry);
	73	ret_t cherokee_config_entry_init (cherokee_config_entry_t *entry);
	74	ret_t cherokee_config_entry_mrproper (cherokee_config_entry_t *entry);
74	75
75	76	ret_t cherokee_config_entry_set_handler_prop (cherokee_config_entry_t entry, char prop_name, cherokee_typed_table_types_t type, void *value, cherokee_table_free_item_t free_func);

r283	r289
45	45	cherokee_reqs_list_mrproper (cherokee_reqs_list_t *rl)
46	46	{
47		list_t i, tmp;
	47	list_t i, tmp;
	48	cherokee_reqs_list_entry_t *entry;
48	49
49		list_for_each_safe (i, tmp, ((list_t *)rl)) {
50		cherokee_reqs_list_entry_free (RQ_ENTRY(i));
	50	i = rl->next;
	51	tmp = i->next;
	52
	53	while (i != rl) {
	54	entry = list_entry (i, cherokee_reqs_list_entry_t, list_node);
	55	cherokee_reqs_list_entry_free (entry);
	56
	57	i = tmp;
	58	tmp = i->next;
51	59	}
52	60
…	…
82	90	int rei;
83	91	pcre *re = NULL;
84		cherokee_reqs_list_entry_t *lentry = list_entry (i, cherokee_reqs_list_entry_t, list_~~entry~~);
	92	cherokee_reqs_list_entry_t *lentry = list_entry (i, cherokee_reqs_list_entry_t, list_node);
85	93	char *pattern = lentry->request.buf;
86	94	cherokee_config_entry_t *entry = &lentry->base_entry;
…	…
130	138	/* Add the new connection
131	139	*/
132		list_add (&plugin_entry->list_~~entry~~, (list_t *)rl);
	140	list_add (&plugin_entry->list_node, (list_t *)rl);
133	141
134	142	/* Compile the expression

r283	r289
31	31	CHEROKEE_NEW_STRUCT (n, reqs_list_entry);
32	32
	33	/* Init properties
	34	*/
	35	memset (n->ovector, 0, sizeof(int)*OVECTOR_LEN);
	36	n->ovecsize = 0;
	37
	38	cherokee_buffer_init (&n->request);
	39	INIT_LIST_HEAD (&n->list_node);
	40
33	41	/* Init base class
34	42	*/
35	43	cherokee_config_entry_init (CONF_ENTRY(n));
36
37		~~memset (n->ovector, 0, sizeof(int)*OVECTOR_LEN);~~
38		~~n->ovecsize = 0;~~
39
40		~~/* Init properties~~
41		*/
42		~~cherokee_buffer_init (&n->request);~~
43		~~INIT_LIST_HEAD (&n->list_entry);~~
44	44
45	45	*entry = n;
…	…
51	51	cherokee_reqs_list_entry_free (cherokee_reqs_list_entry_t *entry)
52	52	{
53		cherokee_buffer_mrproper (&entry->request);
54		return cherokee_config_entry_free (CONF_ENTRY(entry));
	53	cherokee_buffer_mrproper (&entry->request);
	54	cherokee_config_entry_mrproper (CONF_ENTRY(entry));
	55
	56	free (entry);
	57	return ret_ok;
55	58	}
56	59

r283	r289
35	35	cherokee_config_entry_t base_entry;
36	36	cherokee_buffer_t request;
37		list_t list_~~entry~~;
	37	list_t list_node;
38	38
39	39	int ovector[OVECTOR_LEN];