Rename one of the two ban_error() functions

pointed out by Dridi in #3486

introduced by /me in 6cf1138f
parent c5a4be04
...@@ -830,7 +830,7 @@ VRT_synth_page(VRT_CTX, VCL_STRANDS s) ...@@ -830,7 +830,7 @@ VRT_synth_page(VRT_CTX, VCL_STRANDS s)
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
static VCL_VOID 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); CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
AN(ctx->vsl); AN(ctx->vsl);
...@@ -851,19 +851,19 @@ VRT_ban_string(VRT_CTX, VCL_STRING str) ...@@ -851,19 +851,19 @@ VRT_ban_string(VRT_CTX, VCL_STRING str)
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC); CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
if (str == NULL) { if (str == NULL) {
ban_error(ctx, "Null argument"); vrt_ban_error(ctx, "Null argument");
return; return;
} }
bp = BAN_Build(); bp = BAN_Build();
if (bp == NULL) { if (bp == NULL) {
ban_error(ctx, "Out of Memory"); vrt_ban_error(ctx, "Out of Memory");
return; return;
} }
av = VAV_Parse(str, NULL, ARGV_NOESC); av = VAV_Parse(str, NULL, ARGV_NOESC);
AN(av); AN(av);
if (av[0] != NULL) { if (av[0] != NULL) {
ban_error(ctx, av[0]); vrt_ban_error(ctx, av[0]);
VAV_Free(av); VAV_Free(av);
BAN_Abandon(bp); BAN_Abandon(bp);
return; return;
...@@ -871,22 +871,22 @@ VRT_ban_string(VRT_CTX, VCL_STRING str) ...@@ -871,22 +871,22 @@ VRT_ban_string(VRT_CTX, VCL_STRING str)
for (i = 0; ;) { for (i = 0; ;) {
a1 = av[++i]; a1 = av[++i];
if (a1 == NULL) { if (a1 == NULL) {
ban_error(ctx, "No ban conditions found."); vrt_ban_error(ctx, "No ban conditions found.");
break; break;
} }
a2 = av[++i]; a2 = av[++i];
if (a2 == NULL) { if (a2 == NULL) {
ban_error(ctx, "Expected comparison operator."); vrt_ban_error(ctx, "Expected comparison operator.");
break; break;
} }
a3 = av[++i]; a3 = av[++i];
if (a3 == NULL) { if (a3 == NULL) {
ban_error(ctx, "Expected second operand."); vrt_ban_error(ctx, "Expected second operand.");
break; break;
} }
err = BAN_AddTest(bp, a1, a2, a3); err = BAN_AddTest(bp, a1, a2, a3);
if (err != NULL) { if (err != NULL) {
ban_error(ctx, err); vrt_ban_error(ctx, err);
break; break;
} }
if (av[++i] == NULL) { if (av[++i] == NULL) {
...@@ -894,7 +894,7 @@ VRT_ban_string(VRT_CTX, VCL_STRING str) ...@@ -894,7 +894,7 @@ VRT_ban_string(VRT_CTX, VCL_STRING str)
if (err == NULL) if (err == NULL)
bp = NULL; bp = NULL;
else else
ban_error(ctx, err); vrt_ban_error(ctx, err);
break; break;
} }
if (strcmp(av[i], "&&")) { if (strcmp(av[i], "&&")) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment