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
68cadaee
Unverified
Commit
68cadaee
authored
Jan 05, 2021
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename one of the two ban_error() functions
pointed out by Dridi in #3486 introduced by /me in
6cf1138f
parent
c5a4be04
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
cache_vrt.c
bin/varnishd/cache/cache_vrt.c
+9
-9
No files found.
bin/varnishd/cache/cache_vrt.c
View file @
68cadaee
...
...
@@ -830,7 +830,7 @@ VRT_synth_page(VRT_CTX, VCL_STRANDS s)
/*--------------------------------------------------------------------*/
static
VCL_VOID
ban_error
(
VRT_CTX
,
VCL_STRING
err
)
vrt_
ban_error
(
VRT_CTX
,
VCL_STRING
err
)
{
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
AN
(
ctx
->
vsl
);
...
...
@@ -851,19 +851,19 @@ VRT_ban_string(VRT_CTX, VCL_STRING str)
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
if
(
str
==
NULL
)
{
ban_error
(
ctx
,
"Null argument"
);
vrt_
ban_error
(
ctx
,
"Null argument"
);
return
;
}
bp
=
BAN_Build
();
if
(
bp
==
NULL
)
{
ban_error
(
ctx
,
"Out of Memory"
);
vrt_
ban_error
(
ctx
,
"Out of Memory"
);
return
;
}
av
=
VAV_Parse
(
str
,
NULL
,
ARGV_NOESC
);
AN
(
av
);
if
(
av
[
0
]
!=
NULL
)
{
ban_error
(
ctx
,
av
[
0
]);
vrt_
ban_error
(
ctx
,
av
[
0
]);
VAV_Free
(
av
);
BAN_Abandon
(
bp
);
return
;
...
...
@@ -871,22 +871,22 @@ VRT_ban_string(VRT_CTX, VCL_STRING str)
for
(
i
=
0
;
;)
{
a1
=
av
[
++
i
];
if
(
a1
==
NULL
)
{
ban_error
(
ctx
,
"No ban conditions found."
);
vrt_
ban_error
(
ctx
,
"No ban conditions found."
);
break
;
}
a2
=
av
[
++
i
];
if
(
a2
==
NULL
)
{
ban_error
(
ctx
,
"Expected comparison operator."
);
vrt_
ban_error
(
ctx
,
"Expected comparison operator."
);
break
;
}
a3
=
av
[
++
i
];
if
(
a3
==
NULL
)
{
ban_error
(
ctx
,
"Expected second operand."
);
vrt_
ban_error
(
ctx
,
"Expected second operand."
);
break
;
}
err
=
BAN_AddTest
(
bp
,
a1
,
a2
,
a3
);
if
(
err
!=
NULL
)
{
ban_error
(
ctx
,
err
);
vrt_
ban_error
(
ctx
,
err
);
break
;
}
if
(
av
[
++
i
]
==
NULL
)
{
...
...
@@ -894,7 +894,7 @@ VRT_ban_string(VRT_CTX, VCL_STRING str)
if
(
err
==
NULL
)
bp
=
NULL
;
else
ban_error
(
ctx
,
err
);
vrt_
ban_error
(
ctx
,
err
);
break
;
}
if
(
strcmp
(
av
[
i
],
"&&"
))
{
...
...
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