projects
/
apps
/
pfixtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add event to interrupt the server_loop.
[apps/pfixtools.git]
/
postlicyd
/
strlist.c
diff --git
a/postlicyd/strlist.c
b/postlicyd/strlist.c
index
2f17f90
..
0c790cb
100644
(file)
--- a/
postlicyd/strlist.c
+++ b/
postlicyd/strlist.c
@@
-285,7
+285,7
@@
static bool strlist_filter_constructor(filter_t *filter)
lock = false;
} else {
PARSE_CHECK(false, "illegal locking state %.*s",
lock = false;
} else {
PARSE_CHECK(false, "illegal locking state %.*s",
-
p - current
, current);
+
(int)(p - current)
, current);
}
break;
}
break;
@@
-301,7
+301,7
@@
static bool strlist_filter_constructor(filter_t *filter)
reverse = false;
} else {
PARSE_CHECK(false, "illegal character order value %.*s",
reverse = false;
} else {
PARSE_CHECK(false, "illegal character order value %.*s",
-
p - current
, current);
+
(int)(p - current)
, current);
}
break;
}
break;
@@
-309,7
+309,7
@@
static bool strlist_filter_constructor(filter_t *filter)
weight = strtol(current, &next, 10);
PARSE_CHECK(next == p && weight >= 0 && weight <= 1024,
"illegal weight value %.*s",
weight = strtol(current, &next, 10);
PARSE_CHECK(next == p && weight >= 0 && weight <= 1024,
"illegal weight value %.*s",
- (p - current), current);
+ (
int)(
p - current), current);
break;
case 3:
break;
case 3:
@@
-358,7
+358,7
@@
static bool strlist_filter_constructor(filter_t *filter)
lock = false;
} else {
PARSE_CHECK(false, "illegal locking state %.*s",
lock = false;
} else {
PARSE_CHECK(false, "illegal locking state %.*s",
-
p - current
, current);
+
(int)(p - current)
, current);
}
break;
}
break;
@@
-366,7
+366,7
@@
static bool strlist_filter_constructor(filter_t *filter)
weight = strtol(current, &next, 10);
PARSE_CHECK(next == p && weight >= 0 && weight <= 1024,
"illegal weight value %.*s",
weight = strtol(current, &next, 10);
PARSE_CHECK(next == p && weight >= 0 && weight <= 1024,
"illegal weight value %.*s",
- (p - current), current);
+ (
int)(
p - current), current);
break;
case 2:
break;
case 2:
@@
-412,7
+412,7
@@
static bool strlist_filter_constructor(filter_t *filter)
weight = strtol(current, &next, 10);
PARSE_CHECK(next == p && weight >= 0 && weight <= 1024,
"illegal weight value %.*s",
weight = strtol(current, &next, 10);
PARSE_CHECK(next == p && weight >= 0 && weight <= 1024,
"illegal weight value %.*s",
- (p - current), current);
+ (
int)(
p - current), current);
break;
case 1:
break;
case 1:
@@
-470,7
+470,7
@@
static bool strlist_filter_constructor(filter_t *filter)
CASE(RECIPIENT, recipient, email);
#undef CASE
default:
CASE(RECIPIENT, recipient, email);
#undef CASE
default:
- PARSE_CHECK(false, "unknown field %.*s",
p - current
, current);
+ PARSE_CHECK(false, "unknown field %.*s",
(int)(p - current)
, current);
break;
}
if (!*p) {
break;
}
if (!*p) {
@@
-487,7
+487,7
@@
static bool strlist_filter_constructor(filter_t *filter)
PARSE_CHECK(config->is_email != config->is_hostname,
"matched field MUST be emails XOR hostnames");
PARSE_CHECK(config->is_email != config->is_hostname,
"matched field MUST be emails XOR hostnames");
- PARSE_CHECK(config->tries.len,
+ PARSE_CHECK(config->tries.len
|| config->host_offsets.len
,
"no file parameter in the filter %s", filter->name);
filter->data = config;
return true;
"no file parameter in the filter %s", filter->name);
filter->data = config;
return true;
@@
-543,7
+543,7
@@
static filter_result_t strlist_filter(const filter_t *filter, const query_t *que
if (config->match_ ## Flag) { \
const int len = m_strlen(query->Field); \
strlist_copy(normal, query->Field, len, false); \
if (config->match_ ## Flag) { \
const int len = m_strlen(query->Field); \
strlist_copy(normal, query->Field, len, false); \
- for (uint32_t i = 0 ; len > 0 && i < config->
tries.len ; ++i) {
\
+ for (uint32_t i = 0 ; len > 0 && i < config->
host_offsets.len ; ++i) {
\
const char *rbl = array_ptr(config->hosts, \
array_elt(config->host_offsets, i));\
const int weight = array_elt(config->host_weights, i); \
const char *rbl = array_ptr(config->hosts, \
array_elt(config->host_offsets, i));\
const int weight = array_elt(config->host_weights, i); \