Merge branch 'master' into ext-perl

[chaz/homebank] / src / hb-archive.c

diff --git a/src/hb-archive.c b/src/hb-archive.c
index cbb732883fd598b6d53f70e06dd497dc69a80a7a..7c4264fbb4289868badd8a52824187518f59803d 100644 (file)
--- a/src/hb-archive.c
+++ b/src/hb-archive.c
@@ -21,6 +21,9 @@
 #include "hb-archive.h"
 #include "hb-split.h"
 
+#include "ext.h"
+#include "refcount.h"
+
 /****************************************************************************/
 /* Debug macros                                                             */
 /****************************************************************************/
@@ -72,10 +75,10 @@ da_archive_clean(Archive *item)
 
 void da_archive_free(Archive *item)
 {
-       if(item != NULL)
+       if(rc_unref(item))
        {
                da_archive_clean(item);
-               g_free(item);
+               rc_free(item);
        }
 }
 
@@ -84,7 +87,7 @@ Archive *da_archive_malloc(void)
 {
 Archive *item;
 
-       item = g_malloc0(sizeof(Archive));
+       item = rc_alloc(sizeof(Archive));
        item->key = 1;
        return item;
 }
@@ -92,7 +95,7 @@ Archive *item;
 
 Archive *da_archive_clone(Archive *src_item)
 {
-Archive *new_item = g_memdup(src_item, sizeof(Archive));
+Archive *new_item = rc_dup(src_item, sizeof(Archive));
 
        if(new_item)
        {