Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libvmod-re2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
libvmod-re2
Commits
e5466e98
Commit
e5466e98
authored
Feb 05, 2019
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adjust to vmodtool changes in master
parent
7f0cf6fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
set.c
src/set.c
+6
-6
vmod_re2.vcc
src/vmod_re2.vcc
+1
-0
No files found.
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,
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
;
...
...
src/vmod_re2.vcc
View file @
e5466e98
...
...
@@ -8,6 +8,7 @@
#
$Module re2 3 "Varnish Module for access to the Google RE2 regular expression engine"
$Prefix vmod
$Synopsis manual
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment