Context Navigation

Changeset 428

Timestamp:

07/07/2005 10:39:14 PM (3 years ago)

Author:

jan

Message:

use log_* functions for debugging and don't segfault on evaluation

Location:

branches/lighttpd-1.3.x/src

Files:

r427	r428
31	31	p->trigger_if = buffer_array_init();
32	32	p->output_include = buffer_array_init();
	33	p->params = tnode_val_array_init();
33	34
34	35	return p;
…	…
54	55	free(p->config_storage);
55	56	}
	57
	58	tnode_val_array_free(p->params);
56	59
57	60	buffer_array_free(p->eval);
…	…
290	293	buffer_reset(p->trigger_handler);
291	294
	295	tnode_val_array_reset(p->params);
	296
292	297	if (buffer_is_empty(p->conf.ext)) return HANDLER_GO_ON;
293	298

r423	r428
79	79	int tnode_prepare_string(tnode *t);
80	80
	81	tnode_val_array *tnode_val_array_init();
	82	void tnode_val_array_free(tnode_val_array *tva);
	83	void tnode_val_array_reset(tnode_val_array *tva);
	84
81	85	#define CACHE_FUNC_PROTO(x) int x(server srv, connection con, plugin_data p, tnode result)
82	86

r421	r428
34	34
35	35	if (p->params->ptr[0]->type != T_NODE_VALUE_STRING) {
36		fprintf(stderr, "%s.%d: f_file_mtime: I need a string: %d\n",
37		__FILE__, __LINE__, p->params->ptr[0]->type);
	36	log_error_write(srv, __FILE__, __LINE__, "sd",
	37	"f_file_mtime: I need a string:",
	38	p->params->ptr[0]->type);
38	39
39	40	return -1;
…	…
47	48
48	49	if (-1 == stat(b->ptr, &st)) {
49		log_error_write(srv, __FILE__, __LINE__, "sbs", "trigger.if file.mtime():", b, strerror(errno));
	50	log_error_write(srv, __FILE__, __LINE__, "sbs",
	51	"trigger.if file.mtime():", b, strerror(errno));
50	52
51	53	buffer_free(b);
…	…
65	67
66	68	if (p->params->ptr[0]->type != T_NODE_VALUE_STRING) {
67		fprintf(stderr, "%s.%d: f_mysql_escape: I need a string: %d\n",
68		__FILE__, __LINE__, p->params->ptr[0]->type);
	69	log_error_write(srv, __FILE__, __LINE__, "sd",
	70	"f_mysql_escape: I need a string:",
	71	p->params->ptr[0]->type);
69	72
70	73	return -1;
…	…
82	85
83	86	if (p->params->ptr[0]->type != T_NODE_VALUE_STRING) {
84		fprintf(stderr, "%s.%d: f_mysql_escape: I need a string: %d\n",
85		__FILE__, __LINE__, p->params->ptr[0]->type);
	87	log_error_write(srv, __FILE__, __LINE__, "sd",
	88	"f_mysql_query: I need a string:",
	89	p->params->ptr[0]->type);
86	90	return -1;
87	91	}

r427	r428
92	92	free(tva);
93	93	}
	94
	95	void tnode_val_array_reset(tnode_val_array *tva) {
	96	size_t i;
	97
	98	if (!tva) return;
	99
	100	for (i = 0; i < tva->used; i++) {
	101	tnode_val_free(tva->ptr[i]);
	102	}
	103
	104	tva->used = 0;
	105	}
	106
94	107
95	108	tnode *tnode_init() {
…	…
330	343
331	344	if (0 != cache_parse_parameters(srv, con, p, br_open + 1, t->used - slen - 3, p->params)) {
332		~~fprintf(stderr, "%s.%d: parsing parameters failed\n~~",
333		~~__FILE__, __LINE__~~
334		);
	345	log_error_write(srv, __FILE__, __LINE__, "s",
	346	"parsing parameters failed");
	347
335	348	return -1;
336	349	}
337	350
338	351	if (p->params->used != f[i].params) {
339		fprintf(stderr, "%s.%d: wrong param-count for %s: %d, expected %d\n",
340		__FILE__, __LINE__,
341		f[i].name,
342		p->params->used,
343		f[i].params
344		);
	352	log_error_write(srv, __FILE__, __LINE__, "sssdsd",
	353	"wrong param-count for", f[i].name,
	354	"got", p->params->used,
	355	"expected", f[i].params);
345	356	return -1;
346	357	}
…	…
348	359
349	360	if (0 != f[i].func(srv, con, p, n)) {
350		fprintf(stderr, "%s.%d: function %s failed\n", __FILE__, __LINE__, f[i].name);
	361	log_error_write(srv, __FILE__, __LINE__, "ss",
	362	"calling function failed for",
	363	f[i].name);
351	364	return -1;
352	365	}
…	…
363	376	if (*err != '\0') {
364	377	/* isn't a int */
365		~~fprintf(stderr, "%s.%d: can't evaluate: '%s', '%s'\n~~",
366		~~__FILE__, __LINE__,~~
367		t->ptr, err);
	378	log_error_write(srv, __FILE__, __LINE__, "sss",
	379	"can't evaluate:",
	380	t->ptr, err);
368	381
369	382	return -1;