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
656aa24b
Commit
656aa24b
authored
Aug 20, 2021
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename VRT_CollectStrands() to VRT_STRANDS_string()
parent
67fb2265
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
5 deletions
+6
-5
cache_vrt.c
bin/varnishd/cache/cache_vrt.c
+1
-1
vrt.h
include/vrt.h
+2
-1
vcc_types.c
lib/libvcc/vcc_types.c
+1
-1
vmod_blob.c
vmod/vmod_blob.c
+1
-1
vmod_debug.c
vmod/vmod_debug.c
+1
-1
No files found.
bin/varnishd/cache/cache_vrt.c
View file @
656aa24b
...
...
@@ -593,7 +593,7 @@ VRT_StrandsWS(struct ws *ws, const char *h, VCL_STRANDS s)
*/
VCL_STRING
VRT_
CollectStrands
(
VRT_CTX
,
VCL_STRANDS
s
)
VRT_
STRANDS_string
(
VRT_CTX
,
VCL_STRANDS
s
)
{
const
char
*
b
;
...
...
include/vrt.h
View file @
656aa24b
...
...
@@ -54,6 +54,7 @@
* binary/load-time compatible, increment MAJOR version
*
* NEXT (2021-09-15)
* VRT_CollectStrands() renamed to VRT_STRANDS_string()
* VRT_l_{beresp|resp}_body() changed to takes STRANDS argument
* VRT_SetHdr() changed to take `const char*` & `STRANDS` arguments.
* VRT_UnsetHdr() added
...
...
@@ -454,7 +455,6 @@ VCL_BOOL VRT_Strands2Bool(VCL_STRANDS);
uint32_t
VRT_HashStrands32
(
VCL_STRANDS
);
char
*
VRT_Strands
(
char
*
,
size_t
,
VCL_STRANDS
);
VCL_STRING
VRT_StrandsWS
(
struct
ws
*
,
const
char
*
,
VCL_STRANDS
);
VCL_STRING
VRT_CollectStrands
(
VRT_CTX
,
VCL_STRANDS
);
VCL_STRING
VRT_UpperLowerStrands
(
VRT_CTX
,
VCL_STRANDS
s
,
int
up
);
/* VCL_SUB */
...
...
@@ -471,6 +471,7 @@ VCL_STRING VRT_INT_string(VRT_CTX, VCL_INT);
VCL_STRING
VRT_IP_string
(
VRT_CTX
,
VCL_IP
);
VCL_STRING
VRT_REAL_string
(
VRT_CTX
,
VCL_REAL
);
VCL_STRING
VRT_STEVEDORE_string
(
VCL_STEVEDORE
);
VCL_STRING
VRT_STRANDS_string
(
VRT_CTX
,
VCL_STRANDS
);
VCL_STRING
VRT_TIME_string
(
VRT_CTX
,
VCL_TIME
);
/* historical */
...
...
lib/libvcc/vcc_types.c
View file @
656aa24b
...
...
@@ -184,7 +184,7 @@ const struct type STRANDS[1] = {{
.
magic
=
TYPE_MAGIC
,
.
name
=
"STRANDS"
,
.
stringform
=
1
,
.
tostring
=
"VRT_
CollectStrands
(ctx,
\v
+
\n\v
1
\v
-
\n
)"
,
.
tostring
=
"VRT_
STRANDS_string
(ctx,
\v
+
\n\v
1
\v
-
\n
)"
,
}};
static
const
struct
vcc_method
strings_methods
[]
=
{
...
...
vmod/vmod_blob.c
View file @
656aa24b
...
...
@@ -470,7 +470,7 @@ vmod_transcode(VRT_CTX, VCL_ENUM decs, VCL_ENUM encs, VCL_ENUM case_s,
* overflow. If there is only one string already in the
* workspace, then it is re-used.
*/
return
(
VRT_
CollectStrands
(
ctx
,
strings
));
return
(
VRT_
STRANDS_string
(
ctx
,
strings
));
r
=
encode
(
ctx
,
enc
,
kase
,
&
b
);
return
(
r
);
...
...
vmod/vmod_debug.c
View file @
656aa24b
...
...
@@ -779,7 +779,7 @@ xyzzy_collect(VRT_CTX, VCL_STRANDS s)
VCL_STRING
r
;
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
r
=
VRT_
CollectStrands
(
ctx
,
s
);
r
=
VRT_
STRANDS_string
(
ctx
,
s
);
if
(
r
!=
NULL
&&
*
r
!=
'\0'
)
AN
(
WS_Allocated
(
ctx
->
ws
,
r
,
strlen
(
r
)
+
1
));
return
(
r
);
...
...
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