Skip to content

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

Try to clarify for coverity how vsl_delseg() works 

Ref CID 1430127, CID 1430118
parent 4c987be0
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 4 deletions
lib/libvarnishapi/vsm.c
View file @ a3555480
...@@ -304,6 +304,7 @@ static void ...@@ -304,6 +304,7 @@ static void
vsm_delset(struct vsm_set **p) vsm_delset(struct vsm_set **p)
{ {
struct vsm_set *vs; struct vsm_set *vs;
struct vsm_seg *vg;
AN(p); AN(p);
vs = *p; vs = *p;
...@@ -312,10 +313,14 @@ vsm_delset(struct vsm_set **p) ...@@ -312,10 +313,14 @@ vsm_delset(struct vsm_set **p)
closefd(&vs->fd); closefd(&vs->fd);
if (vs->dfd >= 0) if (vs->dfd >= 0)
closefd(&vs->dfd); closefd(&vs->dfd);
while (!VTAILQ_EMPTY(&vs->stale)) while ((vg = VTAILQ_FIRST(&vs->stale)) != NULL) {
vsm_delseg(VTAILQ_FIRST(&vs->stale), 0); AN(vg->flags & VSM_FLAG_STALE);
while (!VTAILQ_EMPTY(&vs->segs)) vsm_delseg(vg, 0);
vsm_delseg(VTAILQ_FIRST(&vs->segs), 0); }
while ((vg = VTAILQ_FIRST(&vs->segs)) != NULL) {
AZ(vg->flags & VSM_FLAG_STALE);
vsm_delseg(vg, 0);
}
assert(VTAILQ_EMPTY(&vs->clusters)); assert(VTAILQ_EMPTY(&vs->clusters));
VLU_Destroy(&vs->vlu); VLU_Destroy(&vs->vlu);
FREE_OBJ(vs); FREE_OBJ(vs);
......
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