Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
7968d1d2
Commit
7968d1d2
authored
Aug 25, 2020
by
Dridi Boukelmoune
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vsc: Add new 'I' and 'X' arguments
And simplify the 'f' argument handling.
parent
b78cb58a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
12 deletions
+23
-12
vsc.h
include/vapi/vsc.h
+3
-1
vsc.c
lib/libvarnishapi/vsc.c
+20
-11
No files found.
include/vapi/vsc.h
View file @
7968d1d2
...
...
@@ -114,7 +114,9 @@ void VSC_Destroy(struct vsc **, struct vsm *);
int
VSC_Arg
(
struct
vsc
*
,
char
arg
,
const
char
*
opt
);
/*
* Handle standard stat-presenter arguments
* 'f' - filter
* 'I' - field inclusion glob
* 'X' - field exclusion glob
* 'f' - legacy field filter glob
*
* Return:
* -1 error, VSM_Error() returns diagnostic string
...
...
lib/libvarnishapi/vsc.c
View file @
7968d1d2
...
...
@@ -138,27 +138,34 @@ VSC_New(void)
/*--------------------------------------------------------------------*/
static
int
vsc_
f_arg
(
struct
vsc
*
vsc
,
const
char
*
opt
)
vsc_
sf_arg
(
struct
vsc
*
vsc
,
const
char
*
glob
,
const
struct
vsc_sf_mode
*
mode
)
{
struct
vsc_sf
*
sf
;
AN
(
opt
);
CHECK_OBJ_NOTNULL
(
vsc
,
VSC_MAGIC
);
AN
(
glob
);
AN
(
mode
);
ALLOC_OBJ
(
sf
,
VSC_SF_MAGIC
);
AN
(
sf
);
if
(
opt
[
0
]
==
'^'
)
{
sf
->
mode
=
VSC_SF_EXCLUDE
;
opt
++
;
}
else
{
sf
->
mode
=
VSC_SF_INCLUDE
;
}
REPLACE
(
sf
->
pattern
,
opt
);
REPLACE
(
sf
->
pattern
,
glob
);
sf
->
mode
=
mode
;
VTAILQ_INSERT_TAIL
(
&
vsc
->
sf_list
,
sf
,
list
);
return
(
1
);
}
static
int
vsc_f_arg
(
struct
vsc
*
vsc
,
const
char
*
opt
)
{
CHECK_OBJ_NOTNULL
(
vsc
,
VSC_MAGIC
);
AN
(
opt
);
if
(
opt
[
0
]
==
'^'
)
return
(
vsc_sf_arg
(
vsc
,
opt
+
1
,
VSC_SF_EXCLUDE
));
return
(
vsc_sf_arg
(
vsc
,
opt
,
VSC_SF_INCLUDE
));
}
/*--------------------------------------------------------------------*/
int
...
...
@@ -168,6 +175,8 @@ VSC_Arg(struct vsc *vsc, char arg, const char *opt)
CHECK_OBJ_NOTNULL
(
vsc
,
VSC_MAGIC
);
switch
(
arg
)
{
case
'I'
:
return
(
vsc_sf_arg
(
vsc
,
opt
,
VSC_SF_INCLUDE
));
case
'X'
:
return
(
vsc_sf_arg
(
vsc
,
opt
,
VSC_SF_EXCLUDE
));
case
'f'
:
return
(
vsc_f_arg
(
vsc
,
opt
));
default:
return
(
0
);
}
...
...
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