From b6573c69e6b670a936a77db23bd3dc67a3b6b560 Mon Sep 17 00:00:00 2001 From: Love Hornquist Astrand Date: Wed, 27 Oct 2010 20:33:57 -0700 Subject: [PATCH] more base --- base/dict.c | 2 +- base/heimbase.h | 8 ++++++-- base/heimbasepriv.h | 5 ----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/base/dict.c b/base/dict.c index 46a028cfd..7522c8c1c 100644 --- a/base/dict.c +++ b/base/dict.c @@ -259,7 +259,7 @@ heim_dict_iterate_f(heim_dict_t dict, heim_dict_iterator_f_t func, void *arg) for (h = dict->tab; h < &dict->tab[dict->size]; ++h) for (g = *h; g; g = g->next) - func(dict, g->key, g->value, arg); + func(g->key, g->value, arg); } #ifdef __BLOCKS__ diff --git a/base/heimbase.h b/base/heimbase.h index 74d2b2b55..17eb12ea5 100644 --- a/base/heimbase.h +++ b/base/heimbase.h @@ -48,10 +48,14 @@ typedef heim_object_t heim_null_t; #define HEIM_BASE_ONCE_INIT 0 typedef long heim_base_once_t; /* XXX arch dependant */ - void * heim_retain(heim_object_t); void heim_release(heim_object_t); +typedef void (*heim_type_dealloc)(void *); + +void * +heim_alloc(size_t size, const char *name, heim_type_dealloc dealloc); + heim_tid_t heim_get_tid(heim_object_t object); @@ -123,7 +127,7 @@ typedef struct heim_dict_data *heim_dict_t; heim_dict_t heim_dict_create(size_t size); heim_tid_t heim_dict_get_type_id(void); -typedef void (*heim_dict_iterator_f_t)(heim_object_t, heim_object_t, heim_object_t, void *); +typedef void (*heim_dict_iterator_f_t)(heim_object_t, heim_object_t, void *); int heim_dict_add_value(heim_dict_t, heim_object_t, heim_object_t); void heim_dict_iterate_f(heim_dict_t, heim_dict_iterator_f_t, void *); diff --git a/base/heimbasepriv.h b/base/heimbasepriv.h index a12773676..772962548 100644 --- a/base/heimbasepriv.h +++ b/base/heimbasepriv.h @@ -34,7 +34,6 @@ */ typedef void (*heim_type_init)(void *); -typedef void (*heim_type_dealloc)(void *); typedef heim_object_t (*heim_type_copy)(void *); typedef int (*heim_type_cmp)(void *, void *); typedef unsigned long (*heim_type_hash)(void *); @@ -71,10 +70,6 @@ struct heim_type_data { heim_type_t _heim_get_isa(heim_object_t); -/* alloc allocates a plain memory object */ -void * -heim_alloc(size_t size, const char *name, heim_type_dealloc dealloc); - heim_type_t _heim_create_type(const char *name, heim_type_init init,