Commit e5466e98 by Nils Goroll

adjust to vmodtool changes in master

parent 7f0cf6fe
......@@ -499,15 +499,15 @@ get_match_idx(VRT_CTX, struct vmod_re2_set *set, VCL_INT n, VCL_ENUM selects,
return -1;
}
if (task->nmatches > 1) {
if (selects == vmod_enum_UNIQUE) {
if (selects == VENUM(UNIQUE)) {
VERR(ctx, "%s.%s(%lld): %d successful matches",
set->vcl_name, method, n, task->nmatches);
return -1;
}
if (selects == vmod_enum_LAST)
if (selects == VENUM(LAST))
idx = task->nmatches - 1;
else
assert(selects == vmod_enum_FIRST);
assert(selects == VENUM(FIRST));
}
WS_Assert_Allocated(ctx->ws, task->matches,
task->nmatches * sizeof(int));
......@@ -638,11 +638,11 @@ vmod_set_saved(VRT_CTX, struct vmod_re2_set *set, VCL_ENUM whichs, VCL_INT n,
idx = get_match_idx(ctx, set, n, selects, "saved");
if (idx < 0)
return 0;
if (whichs == vmod_enum_REGEX)
if (whichs == VENUM(REGEX))
return vbit_test(set->added[RE_ADDED], idx);
if (whichs == vmod_enum_BE)
if (whichs == VENUM(BE))
return vbit_test(set->added[BE_ADDED], idx);
if (whichs == vmod_enum_STR)
if (whichs == VENUM(STR))
return vbit_test(set->added[STR_ADDED], idx);
WRONG("illegal which ENUM");
return 0;
......
......@@ -8,6 +8,7 @@
#
$Module re2 3 "Varnish Module for access to the Google RE2 regular expression engine"
$Prefix vmod
$Synopsis manual
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment