Skip to content

V
varnish-cache
Unverified Commit 046724d6 authored by Nils Goroll's avatar Nils Goroll
Browse files
Options

Minor refactor of sml_objfree(): Add local variable for stevedore

parent 47163682
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
bin/varnishd/storage/storage_simple.c
View file @ 046724d6
...@@ -252,21 +252,25 @@ sml_slim(struct worker *wrk, struct objcore *oc) ...@@ -252,21 +252,25 @@ sml_slim(struct worker *wrk, struct objcore *oc)
static void v_matchproto_(objfree_f) static void v_matchproto_(objfree_f)
sml_objfree(struct worker *wrk, struct objcore *oc) sml_objfree(struct worker *wrk, struct objcore *oc)
{ {
const struct stevedore *stv;
struct storage *st; struct storage *st;
struct object *o; struct object *o;
CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC); CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC); CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
sml_slim(wrk, oc); stv = oc->stobj->stevedore;
CHECK_OBJ_NOTNULL(stv, STEVEDORE_MAGIC);
CAST_OBJ_NOTNULL(o, oc->stobj->priv, OBJECT_MAGIC); CAST_OBJ_NOTNULL(o, oc->stobj->priv, OBJECT_MAGIC);
sml_slim(wrk, oc);
st = o->objstore; st = o->objstore;
CHECK_OBJ_NOTNULL(st, STORAGE_MAGIC); CHECK_OBJ_NOTNULL(st, STORAGE_MAGIC);
FINI_OBJ(o); FINI_OBJ(o);
if (oc->boc == NULL && oc->stobj->stevedore->lru != NULL) if (oc->boc == NULL && stv->lru != NULL)
LRU_Remove(oc); LRU_Remove(oc);
sml_stv_free(oc->stobj->stevedore, st); sml_stv_free(stv, st);
memset(oc->stobj, 0, sizeof oc->stobj); memset(oc->stobj, 0, sizeof oc->stobj);
......
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