From 0f9bef055788c60cd4f6621a46b047abb86bc193 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Mon, 16 May 2011 16:42:35 -0600 Subject: Consolidate reference counting code. --- libdimension/interior.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'libdimension/interior.c') diff --git a/libdimension/interior.c b/libdimension/interior.c index 939bd4f..0eec274 100644 --- a/libdimension/interior.c +++ b/libdimension/interior.c @@ -33,8 +33,7 @@ dmnsn_new_interior(void) dmnsn_interior *interior = dmnsn_malloc(sizeof(dmnsn_interior)); interior->ior = 1.0; interior->free_fn = NULL; - interior->refcount = dmnsn_malloc(sizeof(unsigned int)); - *interior->refcount = 1; + interior->refcount = dmnsn_new_refcount(); return interior; } @@ -42,15 +41,11 @@ dmnsn_new_interior(void) void dmnsn_delete_interior(dmnsn_interior *interior) { - if (interior) { - if (*interior->refcount <= 1) { - if (interior->free_fn) { - interior->free_fn(interior->ptr); - } - dmnsn_free(interior->refcount); - dmnsn_free(interior); - } else { - --*interior->refcount; + if (interior && DMNSN_DECREF(interior)) { + if (interior->free_fn) { + interior->free_fn(interior->ptr); } + dmnsn_delete_refcount(interior->refcount); + dmnsn_free(interior); } } -- cgit v1.2.3