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
c0a1057d
Commit
c0a1057d
authored
Nov 09, 2017
by
Geoff Simmons
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use a macro for the long list of regex options.
parent
87df40f0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
32 deletions
+13
-32
vmod_re2.c
src/vmod_re2.c
+13
-32
No files found.
src/vmod_re2.c
View file @
c0a1057d
...
...
@@ -30,6 +30,13 @@
#include "config.h"
#define REGEX_OPTS \
VCL_BOOL utf8, VCL_BOOL posix_syntax, VCL_BOOL longest_match, \
VCL_INT max_mem, VCL_BOOL literal, VCL_BOOL never_nl, \
VCL_BOOL dot_nl, VCL_BOOL never_capture, \
VCL_BOOL case_sensitive, VCL_BOOL perl_classes, \
VCL_BOOL word_boundary, VCL_BOOL one_line
typedef
struct
task_match_t
{
unsigned
magic
;
#define TASK_MATCH_MAGIC 0xa4b93c57
...
...
@@ -232,12 +239,7 @@ event(VRT_CTX, struct vmod_priv *priv, enum vcl_event_e e)
VCL_VOID
vmod_regex__init
(
const
struct
vrt_ctx
*
ctx
,
struct
vmod_re2_regex
**
rep
,
const
char
*
vcl_name
,
VCL_STRING
pattern
,
VCL_BOOL
utf8
,
VCL_BOOL
posix_syntax
,
VCL_BOOL
longest_match
,
VCL_INT
max_mem
,
VCL_BOOL
literal
,
VCL_BOOL
never_nl
,
VCL_BOOL
dot_nl
,
VCL_BOOL
never_capture
,
VCL_BOOL
case_sensitive
,
VCL_BOOL
perl_classes
,
VCL_BOOL
word_boundary
,
VCL_BOOL
one_line
)
const
char
*
vcl_name
,
VCL_STRING
pattern
,
REGEX_OPTS
)
{
struct
vmod_re2_regex
*
re
;
const
char
*
err
;
...
...
@@ -472,11 +474,7 @@ vmod_regex_extract(VRT_CTX, struct vmod_re2_regex *re, VCL_STRING text,
VCL_BOOL
vmod_match
(
VRT_CTX
,
struct
vmod_priv
*
priv
,
VCL_STRING
pattern
,
VCL_STRING
subject
,
VCL_BOOL
utf8
,
VCL_BOOL
posix_syntax
,
VCL_BOOL
longest_match
,
VCL_INT
max_mem
,
VCL_BOOL
literal
,
VCL_BOOL
never_nl
,
VCL_BOOL
dot_nl
,
VCL_BOOL
never_capture
,
VCL_BOOL
case_sensitive
,
VCL_BOOL
perl_classes
,
VCL_BOOL
word_boundary
,
VCL_BOOL
one_line
)
VCL_STRING
subject
,
REGEX_OPTS
)
{
vre2
*
vre2
=
NULL
;
task_match_t
*
task_match
;
...
...
@@ -623,12 +621,7 @@ vmod_namedref(VRT_CTX, struct vmod_priv *priv, VCL_STRING name,
static
VCL_STRING
rewrite_function
(
VRT_CTX
,
const
rewrite_e
mode
,
VCL_STRING
restrict
pattern
,
VCL_STRING
restrict
text
,
VCL_STRING
restrict
rewrite
,
VCL_STRING
restrict
fallback
,
VCL_BOOL
utf8
,
VCL_BOOL
posix_syntax
,
VCL_BOOL
longest_match
,
VCL_INT
max_mem
,
VCL_BOOL
literal
,
VCL_BOOL
never_nl
,
VCL_BOOL
dot_nl
,
VCL_BOOL
never_capture
,
VCL_BOOL
case_sensitive
,
VCL_BOOL
perl_classes
,
VCL_BOOL
word_boundary
,
VCL_BOOL
one_line
)
VCL_STRING
restrict
fallback
,
REGEX_OPTS
)
{
vre2
*
vre2
=
NULL
;
const
char
*
ret
,
*
err
;
...
...
@@ -687,11 +680,7 @@ rewrite_function(VRT_CTX, const rewrite_e mode, VCL_STRING restrict pattern,
VCL_STRING
vmod_sub
(
VRT_CTX
,
VCL_STRING
pattern
,
VCL_STRING
text
,
VCL_STRING
rewrite
,
VCL_STRING
fallback
,
VCL_BOOL
utf8
,
VCL_BOOL
posix_syntax
,
VCL_BOOL
longest_match
,
VCL_INT
max_mem
,
VCL_BOOL
literal
,
VCL_BOOL
never_nl
,
VCL_BOOL
dot_nl
,
VCL_BOOL
never_capture
,
VCL_BOOL
case_sensitive
,
VCL_BOOL
perl_classes
,
VCL_BOOL
word_boundary
,
VCL_BOOL
one_line
)
VCL_STRING
fallback
,
REGEX_OPTS
)
{
return
rewrite_function
(
ctx
,
SUB
,
pattern
,
text
,
rewrite
,
fallback
,
utf8
,
posix_syntax
,
longest_match
,
max_mem
,
...
...
@@ -702,11 +691,7 @@ vmod_sub(VRT_CTX, VCL_STRING pattern, VCL_STRING text, VCL_STRING rewrite,
VCL_STRING
vmod_suball
(
VRT_CTX
,
VCL_STRING
pattern
,
VCL_STRING
text
,
VCL_STRING
rewrite
,
VCL_STRING
fallback
,
VCL_BOOL
utf8
,
VCL_BOOL
posix_syntax
,
VCL_BOOL
longest_match
,
VCL_INT
max_mem
,
VCL_BOOL
literal
,
VCL_BOOL
never_nl
,
VCL_BOOL
dot_nl
,
VCL_BOOL
never_capture
,
VCL_BOOL
case_sensitive
,
VCL_BOOL
perl_classes
,
VCL_BOOL
word_boundary
,
VCL_BOOL
one_line
)
VCL_STRING
fallback
,
REGEX_OPTS
)
{
return
rewrite_function
(
ctx
,
SUBALL
,
pattern
,
text
,
rewrite
,
fallback
,
utf8
,
posix_syntax
,
longest_match
,
max_mem
,
...
...
@@ -717,11 +702,7 @@ vmod_suball(VRT_CTX, VCL_STRING pattern, VCL_STRING text, VCL_STRING rewrite,
VCL_STRING
vmod_extract
(
VRT_CTX
,
VCL_STRING
pattern
,
VCL_STRING
text
,
VCL_STRING
rewrite
,
VCL_STRING
fallback
,
VCL_BOOL
utf8
,
VCL_BOOL
posix_syntax
,
VCL_BOOL
longest_match
,
VCL_INT
max_mem
,
VCL_BOOL
literal
,
VCL_BOOL
never_nl
,
VCL_BOOL
dot_nl
,
VCL_BOOL
never_capture
,
VCL_BOOL
case_sensitive
,
VCL_BOOL
perl_classes
,
VCL_BOOL
word_boundary
,
VCL_BOOL
one_line
)
VCL_STRING
fallback
,
REGEX_OPTS
)
{
return
rewrite_function
(
ctx
,
EXTRACT
,
pattern
,
text
,
rewrite
,
fallback
,
utf8
,
posix_syntax
,
longest_match
,
max_mem
,
...
...
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