From aa5d6895d0ac8c6ea050a8ea55e2f8a39ddfe365 Mon Sep 17 00:00:00 2001 From: xXx-caillou-xXx Date: Tue, 28 Aug 2018 14:24:29 +0200 Subject: Use php's logging functions This commit replace our usage of `php_log_err` with `zend_error`. This should allow administrators to display errors in the webpage, should they want to; and to properly manipulate the verbosity's level. This should close #217 --- src/sp_config.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/sp_config.c') diff --git a/src/sp_config.c b/src/sp_config.c index e5cb3ce..2480362 100644 --- a/src/sp_config.c +++ b/src/sp_config.c @@ -40,7 +40,7 @@ static int parse_line(char *line) { } if (strncmp(ptr, SP_TOKEN_BASE, strlen(SP_TOKEN_BASE))) { - sp_log_err("config", "Invalid configuration prefix for '%s' on line %zu.", + sp_log_err("config", "Invalid configuration prefix for '%s' on line %zu", line, sp_line_no); return -1; } @@ -51,7 +51,7 @@ static int parse_line(char *line) { return sp_func[i].func(ptr + strlen(sp_func[i].token)); } } - sp_log_err("config", "Invalid configuration section '%s' on line %zu.", line, + sp_log_err("config", "Invalid configuration section '%s' on line %zu", line, sp_line_no); return -1; } @@ -114,7 +114,7 @@ int parse_php_type(char *restrict line, char *restrict keyword, void *retval) { "%s) is expecting a valid php type ('false', 'true'," " 'array'. 'object', 'long', 'double', 'null', 'resource', " "'reference'," - " 'undef') on line %zu.", + " 'undef') on line %zu", keyword, sp_line_no); return -1; } @@ -149,7 +149,7 @@ int parse_cidr(char *restrict line, char *restrict keyword, void *retval) { *(sp_cidr **)retval = cidr; return consumed; } else { - sp_log_err("config", "%s doesn't contain a valid cidr on line %zu.", line, + sp_log_err("config", "%s doesn't contain a valid cidr on line %zu", line, sp_line_no); return -1; } @@ -174,7 +174,7 @@ int parse_regexp(char *restrict line, char *restrict keyword, void *retval) { closing_paren[0] = '\0'; } sp_log_err("config", - "'%s)' is expecting a valid regexp, and not '%s' on line %zu.", + "'%s)' is expecting a valid regexp, and not '%s' on line %zu", keyword, line, sp_line_no); return -1; } -- cgit v1.3