]> err.no Git - varnish/commitdiff
Polish: use mini_obj.h
authorphk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Tue, 1 Jul 2008 19:31:16 +0000 (19:31 +0000)
committerphk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Tue, 1 Jul 2008 19:31:16 +0000 (19:31 +0000)
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2876 d4fa192b-c00b-0410-8231-f00ffab90ce4

varnish-cache/bin/varnishd/cache_dir_simple.c

index 5cc5131309619fcd9534dd9141149fe05fe8f30a..bbea21942a2f90b8621354e1d54b793afe53439d 100644 (file)
@@ -73,7 +73,8 @@ vdi_simple_fini(struct director *d)
        CAST_OBJ_NOTNULL(vs, d->priv, VDI_SIMPLE_MAGIC);
        
        VBE_DropRef(vs->backend);
-       free(vs);
+       vs->dir.magic = 0;
+       FREE_OBJ(vs);
 }
 
 void
@@ -83,9 +84,8 @@ VRT_init_dir_simple(struct cli *cli, struct director **bp, const struct vrt_dir_
        
        (void)cli;
 
-       vs = calloc(sizeof *vs, 1);
+       ALLOC_OBJ(vs, VDI_SIMPLE_MAGIC);
        XXXAN(vs);
-       vs->magic = VDI_SIMPLE_MAGIC;
        vs->dir.magic = DIRECTOR_MAGIC;
        vs->dir.priv = vs;
        vs->dir.name = "simple";