Skip to content

L
libvmod-re2
Commit e5466e98 authored by Nils Goroll's avatar Nils Goroll
Browse files
Options

adjust to vmodtool changes in master

parent 7f0cf6fe
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
src/set.c
View file @ e5466e98
...@@ -499,15 +499,15 @@ get_match_idx(VRT_CTX, struct vmod_re2_set *set, VCL_INT n, VCL_ENUM selects, ...@@ -499,15 +499,15 @@ get_match_idx(VRT_CTX, struct vmod_re2_set *set, VCL_INT n, VCL_ENUM selects,
return -1; return -1;
} }
if (task->nmatches > 1) { if (task->nmatches > 1) {
if (selects == vmod_enum_UNIQUE) { if (selects == VENUM(UNIQUE)) {
VERR(ctx, "%s.%s(%lld): %d successful matches", VERR(ctx, "%s.%s(%lld): %d successful matches",
set->vcl_name, method, n, task->nmatches); set->vcl_name, method, n, task->nmatches);
return -1; return -1;
} }
if (selects == vmod_enum_LAST) if (selects == VENUM(LAST))
idx = task->nmatches - 1; idx = task->nmatches - 1;
else else
assert(selects == vmod_enum_FIRST); assert(selects == VENUM(FIRST));
} }
WS_Assert_Allocated(ctx->ws, task->matches, WS_Assert_Allocated(ctx->ws, task->matches,
task->nmatches * sizeof(int)); task->nmatches * sizeof(int));
...@@ -638,11 +638,11 @@ vmod_set_saved(VRT_CTX, struct vmod_re2_set *set, VCL_ENUM whichs, VCL_INT n, ...@@ -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"); idx = get_match_idx(ctx, set, n, selects, "saved");
if (idx < 0) if (idx < 0)
return 0; return 0;
if (whichs == vmod_enum_REGEX) if (whichs == VENUM(REGEX))
return vbit_test(set->added[RE_ADDED], idx); 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); 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); return vbit_test(set->added[STR_ADDED], idx);
WRONG("illegal which ENUM"); WRONG("illegal which ENUM");
return 0; return 0;
......
src/vmod_re2.vcc
View file @ e5466e98
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
# #
$Module re2 3 "Varnish Module for access to the Google RE2 regular expression engine" $Module re2 3 "Varnish Module for access to the Google RE2 regular expression engine"
$Prefix vmod
$Synopsis manual $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