projects
/
apps
/
pfixtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup logging.
[apps/pfixtools.git]
/
postlicyd
/
query.c
diff --git
a/postlicyd/query.c
b/postlicyd/query.c
index
1dc8e6f
..
26b590a
100644
(file)
--- a/
postlicyd/query.c
+++ b/
postlicyd/query.c
@@
-42,7
+42,7
@@
bool query_parse(query_t *query, char *p)
#define PARSE_CHECK(expr, error, ...) \
do { \
if (!(expr)) { \
#define PARSE_CHECK(expr, error, ...) \
do { \
if (!(expr)) { \
-
syslog(LOG_ERR, error, ##__VA_ARGS__);
\
+
err(error, ##__VA_ARGS__);
\
return false; \
} \
} while (0)
return false; \
} \
} while (0)
@@
-69,7
+69,7
@@
bool query_parse(query_t *query, char *p)
vtk = policy_tokenize(v, vlen);
switch (policy_tokenize(k, klen)) {
vtk = policy_tokenize(v, vlen);
switch (policy_tokenize(k, klen)) {
-#define CASE(up, low) case PTK_##up: query->low = v; v[vlen] = '\0';
syslog(LOG_DEBUG, "%s = %s", ptokens[PTK_##up], query->low);
break;
+#define CASE(up, low) case PTK_##up: query->low = v; v[vlen] = '\0'; break;
CASE(HELO_NAME, helo_name);
CASE(QUEUE_ID, queue_id);
CASE(SENDER, sender);
CASE(HELO_NAME, helo_name);
CASE(QUEUE_ID, queue_id);
CASE(SENDER, sender);
@@
-124,7
+124,7
@@
bool query_parse(query_t *query, char *p)
break;
default:
break;
default:
-
syslog(LOG_WARNING,
"unexpected key, skipped: %.*s", klen, k);
+
warn(
"unexpected key, skipped: %.*s", klen, k);
continue;
}
}
continue;
}
}