X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Fconfig.c;h=d1e4d83bd304885f3bc830af3230649b936d93b3;hb=520b2f3bb198bfbb88b90b058ef610f0a9b980c6;hp=848685867d962d3ee0f1dd16c55c67b3e4f22e9a;hpb=8ad7a11fd6ad8b8f5edfbde9da16a18b7a846738;p=apps%2Fpfixtools.git diff --git a/postlicyd/config.c b/postlicyd/config.c index 8486858..d1e4d83 100644 --- a/postlicyd/config.c +++ b/postlicyd/config.c @@ -128,7 +128,7 @@ static bool config_second_pass(config_t *config) ok = false; #define PARSE_CHECK(Expr, Fmt, ...) \ if (!(Expr)) { \ - syslog(LOG_ERR, Fmt, ##__VA_ARGS__); \ + err(Fmt, ##__VA_ARGS__); \ return false; \ } foreach (filter_param_t *param, config->params) { @@ -158,7 +158,7 @@ static bool config_second_pass(config_t *config) array_deep_wipe(config->params, filter_params_wipe); if (!ok) { - syslog(LOG_ERR, "no entry point defined"); + err("no entry point defined"); } return ok; @@ -187,7 +187,7 @@ static bool config_load(config_t *config) linep = p = map.map; #define READ_LOG(Lev, Fmt, ...) \ - syslog(LOG_ ## Lev, "config file %s:%d:%d: " Fmt, config->filename, \ + __log(LOG_ ## Lev, "config file %s:%d:%d: " Fmt, config->filename, \ line + 1, p - linep + 1, ##__VA_ARGS__) #define READ_ERROR(Fmt, ...) \ do { \ @@ -391,7 +391,7 @@ ok: return true; badeof: - syslog(LOG_ERR, "Unexpected end of file"); + err("Unexpected end of file"); error: if (filter.name) {