oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

more base

Browse Source
This commit is contained in:
Love Hornquist Astrand
2010-10-27 20:33:57 -07:00
parent ef78859954
commit b6573c69e6
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base/dict.c
View File

@@ -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 (h = dict->tab; h < &dict->tab[dict->size]; ++h)
for (g = *h; g; g = g->next) for (g = *h; g; g = g->next)
func(dict, g->key, g->value, arg); func(g->key, g->value, arg);
} }
#ifdef __BLOCKS__ #ifdef __BLOCKS__

8
base/heimbase.h
View File

@@ -48,10 +48,14 @@ typedef heim_object_t heim_null_t;
#define HEIM_BASE_ONCE_INIT 0 #define HEIM_BASE_ONCE_INIT 0
typedef long heim_base_once_t; /* XXX arch dependant */ typedef long heim_base_once_t; /* XXX arch dependant */
void * heim_retain(heim_object_t); void * heim_retain(heim_object_t);
void heim_release(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_tid_t
heim_get_tid(heim_object_t object); 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_dict_t heim_dict_create(size_t size);
heim_tid_t heim_dict_get_type_id(void); 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); 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 *); void heim_dict_iterate_f(heim_dict_t, heim_dict_iterator_f_t, void *);

5
base/heimbasepriv.h
View File

@@ -34,7 +34,6 @@
*/ */
typedef void (*heim_type_init)(void *); typedef void (*heim_type_init)(void *);
typedef void (*heim_type_dealloc)(void *);
typedef heim_object_t (*heim_type_copy)(void *); typedef heim_object_t (*heim_type_copy)(void *);
typedef int (*heim_type_cmp)(void *, void *); typedef int (*heim_type_cmp)(void *, void *);
typedef unsigned long (*heim_type_hash)(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); 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_type_t
_heim_create_type(const char *name, _heim_create_type(const char *name,
heim_type_init init, heim_type_init init,