Skip to content

L
libvmod-selector
Unverified Commit 24911df3 authored by Nils Goroll's avatar Nils Goroll
Browse files
Options

WS_Assert_Allocated() has been removed

parent 93f63b7b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
src/match.c
View file @ 24911df3
...@@ -52,7 +52,7 @@ get_match_data(VRT_CTX, struct vmod_selector_set *set, const char *method) ...@@ -52,7 +52,7 @@ get_match_data(VRT_CTX, struct vmod_selector_set *set, const char *method)
match->magic = MATCH_DATA_MAGIC; match->magic = MATCH_DATA_MAGIC;
} }
else { else {
WS_Assert_Allocated(ctx->ws, task->priv, sizeof(*match)); AN(WS_Allocated(ctx->ws, task->priv, sizeof(*match)));
CAST_OBJ(match, task->priv, MATCH_DATA_MAGIC); CAST_OBJ(match, task->priv, MATCH_DATA_MAGIC);
} }
return match; return match;
...@@ -195,7 +195,7 @@ get_existing_match_data(VRT_CTX, ...@@ -195,7 +195,7 @@ get_existing_match_data(VRT_CTX,
set->vcl_name, method); set->vcl_name, method);
return (NULL); return (NULL);
} }
WS_Assert_Allocated(ctx->ws, task->priv, sizeof(*match)); AN(WS_Allocated(ctx->ws, task->priv, sizeof(*match)));
CAST_OBJ(match, task->priv, MATCH_DATA_MAGIC); CAST_OBJ(match, task->priv, MATCH_DATA_MAGIC);
return match; return match;
} }
...@@ -234,8 +234,7 @@ vmod_set_matched(VRT_CTX, struct VPFX(selector_set) *set, VCL_INT idx, ...@@ -234,8 +234,7 @@ vmod_set_matched(VRT_CTX, struct VPFX(selector_set) *set, VCL_INT idx,
return (0); return (0);
AN(match->indices); AN(match->indices);
WS_Assert_Allocated(ctx->ws, match->indices, AN(WS_Allocated(ctx->ws, match->indices, match->n * sizeof(unsigned)));
match->n * sizeof(unsigned));
if (idx > 0) { if (idx > 0) {
/* XXX search algorithm? */ /* XXX search algorithm? */
......
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