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
714774d3
Commit
714774d3
authored
May 02, 2017
by
Dridi Boukelmoune
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make the VSL_TAG macro responsible for casting
parent
9d1adbc5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
vsl_int.h
include/vapi/vsl_int.h
+1
-1
vsl.c
lib/libvarnishapi/vsl.c
+4
-4
vsl_dispatch.c
lib/libvarnishapi/vsl_dispatch.c
+1
-1
No files found.
include/vapi/vsl_int.h
View file @
714774d3
...
@@ -70,7 +70,7 @@
...
@@ -70,7 +70,7 @@
#define VSL_END(ptr, len) ((ptr) + 2 + VSL_WORDS(len))
#define VSL_END(ptr, len) ((ptr) + 2 + VSL_WORDS(len))
#define VSL_NEXT(ptr) VSL_END(ptr, VSL_LEN(ptr))
#define VSL_NEXT(ptr) VSL_END(ptr, VSL_LEN(ptr))
#define VSL_LEN(ptr) ((ptr)[0] & VSL_LENMASK)
#define VSL_LEN(ptr) ((ptr)[0] & VSL_LENMASK)
#define VSL_TAG(ptr) ((
ptr)[0] >> 24
)
#define VSL_TAG(ptr) ((
enum VSL_tag_e)((ptr)[0] >> 24)
)
#define VSL_ID(ptr) (((ptr)[1]) & VSL_IDENTMASK)
#define VSL_ID(ptr) (((ptr)[1]) & VSL_IDENTMASK)
#define VSL_CLIENT(ptr) (((ptr)[1]) & VSL_CLIENTMARKER)
#define VSL_CLIENT(ptr) (((ptr)[1]) & VSL_CLIENTMARKER)
#define VSL_BACKEND(ptr) (((ptr)[1]) & VSL_BACKENDMARKER)
#define VSL_BACKEND(ptr) (((ptr)[1]) & VSL_BACKENDMARKER)
...
...
lib/libvarnishapi/vsl.c
View file @
714774d3
...
@@ -172,7 +172,7 @@ vsl_match_IX(struct VSL_data *vsl, const vslf_list *list,
...
@@ -172,7 +172,7 @@ vsl_match_IX(struct VSL_data *vsl, const vslf_list *list,
const
struct
vslf
*
vslf
;
const
struct
vslf
*
vslf
;
(
void
)
vsl
;
(
void
)
vsl
;
tag
=
(
enum
VSL_tag_e
)
VSL_TAG
(
c
->
rec
.
ptr
);
tag
=
VSL_TAG
(
c
->
rec
.
ptr
);
cdata
=
VSL_CDATA
(
c
->
rec
.
ptr
);
cdata
=
VSL_CDATA
(
c
->
rec
.
ptr
);
len
=
VSL_LEN
(
c
->
rec
.
ptr
);
len
=
VSL_LEN
(
c
->
rec
.
ptr
);
...
@@ -194,7 +194,7 @@ VSL_Match(struct VSL_data *vsl, const struct VSL_cursor *c)
...
@@ -194,7 +194,7 @@ VSL_Match(struct VSL_data *vsl, const struct VSL_cursor *c)
CHECK_OBJ_NOTNULL
(
vsl
,
VSL_MAGIC
);
CHECK_OBJ_NOTNULL
(
vsl
,
VSL_MAGIC
);
if
(
c
==
NULL
||
c
->
rec
.
ptr
==
NULL
)
if
(
c
==
NULL
||
c
->
rec
.
ptr
==
NULL
)
return
(
0
);
return
(
0
);
tag
=
(
enum
VSL_tag_e
)
VSL_TAG
(
c
->
rec
.
ptr
);
tag
=
VSL_TAG
(
c
->
rec
.
ptr
);
if
(
tag
<=
SLT__Bogus
||
tag
>=
SLT__Reserved
)
if
(
tag
<=
SLT__Bogus
||
tag
>=
SLT__Reserved
)
return
(
0
);
return
(
0
);
if
(
vsl
->
c_opt
&&
!
VSL_CLIENT
(
c
->
rec
.
ptr
))
if
(
vsl
->
c_opt
&&
!
VSL_CLIENT
(
c
->
rec
.
ptr
))
...
@@ -245,7 +245,7 @@ VSL_Print(const struct VSL_data *vsl, const struct VSL_cursor *c, void *fo)
...
@@ -245,7 +245,7 @@ VSL_Print(const struct VSL_data *vsl, const struct VSL_cursor *c, void *fo)
return
(
0
);
return
(
0
);
if
(
fo
==
NULL
)
if
(
fo
==
NULL
)
fo
=
stdout
;
fo
=
stdout
;
tag
=
(
enum
VSL_tag_e
)
VSL_TAG
(
c
->
rec
.
ptr
);
tag
=
VSL_TAG
(
c
->
rec
.
ptr
);
vxid
=
VSL_ID
(
c
->
rec
.
ptr
);
vxid
=
VSL_ID
(
c
->
rec
.
ptr
);
len
=
VSL_LEN
(
c
->
rec
.
ptr
);
len
=
VSL_LEN
(
c
->
rec
.
ptr
);
type
=
VSL_CLIENT
(
c
->
rec
.
ptr
)
?
'c'
:
VSL_BACKEND
(
c
->
rec
.
ptr
)
?
type
=
VSL_CLIENT
(
c
->
rec
.
ptr
)
?
'c'
:
VSL_BACKEND
(
c
->
rec
.
ptr
)
?
...
@@ -283,7 +283,7 @@ VSL_PrintTerse(const struct VSL_data *vsl, const struct VSL_cursor *c, void *fo)
...
@@ -283,7 +283,7 @@ VSL_PrintTerse(const struct VSL_data *vsl, const struct VSL_cursor *c, void *fo)
return
(
0
);
return
(
0
);
if
(
fo
==
NULL
)
if
(
fo
==
NULL
)
fo
=
stdout
;
fo
=
stdout
;
tag
=
(
enum
VSL_tag_e
)
VSL_TAG
(
c
->
rec
.
ptr
);
tag
=
VSL_TAG
(
c
->
rec
.
ptr
);
len
=
VSL_LEN
(
c
->
rec
.
ptr
);
len
=
VSL_LEN
(
c
->
rec
.
ptr
);
data
=
VSL_CDATA
(
c
->
rec
.
ptr
);
data
=
VSL_CDATA
(
c
->
rec
.
ptr
);
...
...
lib/libvarnishapi/vsl_dispatch.c
View file @
714774d3
...
@@ -861,7 +861,7 @@ vtx_scan(struct VSLQ *vslq, struct vtx *vtx)
...
@@ -861,7 +861,7 @@ vtx_scan(struct VSLQ *vslq, struct vtx *vtx)
continue
;
continue
;
}
}
tag
=
(
enum
VSL_tag_e
)
VSL_TAG
(
ptr
);
tag
=
VSL_TAG
(
ptr
);
assert
(
tag
!=
SLT__Batch
);
assert
(
tag
!=
SLT__Batch
);
switch
(
tag
)
{
switch
(
tag
)
{
...
...
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