diff options
| author | Akira TAGOH <akira@tagoh.org> | 2011-02-28 15:35:36 +0900 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2011-02-28 15:35:36 +0900 |
| commit | 1f3192c597e303db36016f8c983cf0d30c2c9203 (patch) | |
| tree | b516ffcf0e00fa80857ad6980b103efb9aab50fa | |
| parent | b0d1b21724aa96d56677b242793463a50aa5eb2e (diff) | |
cleanup
| -rw-r--r-- | hieroglyph/hgallocator.c | 8 | ||||
| -rw-r--r-- | hieroglyph/hgallocator.h | 4 | ||||
| -rw-r--r-- | hieroglyph/hgerror.h | 1 | ||||
| -rw-r--r-- | hieroglyph/hgmem.c | 8 | ||||
| -rw-r--r-- | hieroglyph/hgmem.h | 68 |
5 files changed, 44 insertions, 45 deletions
diff --git a/hieroglyph/hgallocator.c b/hieroglyph/hgallocator.c index ed872d4..5b1b2bc 100644 --- a/hieroglyph/hgallocator.c +++ b/hieroglyph/hgallocator.c @@ -829,10 +829,10 @@ _hg_allocator_block_unref(hg_allocator_data_t *data, } static hg_bool_t -_hg_allocator_block_foreach(hg_allocator_data_t *data, - hg_block_iter_flags_t flags, - hg_quark_iterator_func_t func, - hg_pointer_t user_data) +_hg_allocator_block_foreach(hg_allocator_data_t *data, + hg_block_iter_flags_t flags, + hg_block_iter_func_t func, + hg_pointer_t user_data) { return TRUE; } diff --git a/hieroglyph/hgallocator.h b/hieroglyph/hgallocator.h index 6a6563c..e46524e 100644 --- a/hieroglyph/hgallocator.h +++ b/hieroglyph/hgallocator.h @@ -42,7 +42,7 @@ typedef enum _hg_block_iter_flags_t hg_block_iter_flags_t; typedef hg_bool_t (* hg_gc_mark_func_t) (hg_pointer_t object); typedef void (* hg_finalizer_func_t) (hg_pointer_t object); -typedef hg_bool_t (* hg_quark_iterator_func_t) (hg_quark_t qdata, +typedef hg_bool_t (* hg_block_iter_func_t) (hg_quark_t qdata, hg_pointer_t user_data); /** @@ -133,7 +133,7 @@ struct _hg_mem_vtable_t { hg_quark_t quark); hg_bool_t (* block_foreach) (hg_allocator_data_t *data, hg_block_iter_flags_t flags, - hg_quark_iterator_func_t func, + hg_block_iter_func_t func, hg_pointer_t user_data); hg_int_t (* add_gc_marker) (hg_allocator_data_t *data, hg_gc_mark_func_t func); diff --git a/hieroglyph/hgerror.h b/hieroglyph/hgerror.h index a59a0e3..710c396 100644 --- a/hieroglyph/hgerror.h +++ b/hieroglyph/hgerror.h @@ -67,7 +67,6 @@ HG_BEGIN_DECLS #define hg_error_return(_status_,_reason_) \ hg_error_return_val((_status_) == HG_STATUS_SUCCESS, (_status_), (_reason_)) -typedef enum _hg_vm_error_t hg_vm_error_t; typedef enum _hg_error_status_t hg_error_status_t; typedef enum _hg_error_reason_t hg_error_reason_t; diff --git a/hieroglyph/hgmem.c b/hieroglyph/hgmem.c index 30b7419..e334d9f 100644 --- a/hieroglyph/hgmem.c +++ b/hieroglyph/hgmem.c @@ -770,10 +770,10 @@ hg_mem_unref(hg_mem_t *mem, * Returns: */ hg_bool_t -hg_mem_foreach(hg_mem_t *mem, - hg_block_iter_flags_t flags, - hg_quark_iterator_func_t func, - hg_pointer_t user_data) +hg_mem_foreach(hg_mem_t *mem, + hg_block_iter_flags_t flags, + hg_block_iter_func_t func, + hg_pointer_t user_data) { hg_return_val_if_fail (mem != NULL, FALSE, HG_e_VMerror); hg_return_val_if_fail (mem->allocator != NULL, FALSE, HG_e_VMerror); diff --git a/hieroglyph/hgmem.h b/hieroglyph/hgmem.h index e4407b9..d06b7dc 100644 --- a/hieroglyph/hgmem.h +++ b/hieroglyph/hgmem.h @@ -85,40 +85,40 @@ hg_usize_t hg_mem_spool_get_total_size (hg_mem_t *mem); hg_usize_t hg_mem_spool_get_used_size (hg_mem_t *mem); /* memory management */ -hg_quark_t hg_mem_alloc (hg_mem_t *mem, - hg_usize_t size, - hg_pointer_t *ret); -hg_quark_t hg_mem_alloc_with_flags(hg_mem_t *mem, - hg_usize_t size, - hg_uint_t flags, - hg_pointer_t *ret); -hg_quark_t hg_mem_realloc (hg_mem_t *mem, - hg_quark_t qdata, - hg_usize_t size, - hg_pointer_t *ret); -void hg_mem_free (hg_mem_t *mem, - hg_quark_t qdata); -void hg_mem_set_gc_marker (hg_mem_t *mem, - hg_quark_t qdata, - hg_int_t marker_id); -void hg_mem_set_finalizer (hg_mem_t *mem, - hg_quark_t qdata, - hg_int_t finalizer_id); -hg_pointer_t hg_mem_lock_object (hg_mem_t *mem, - hg_quark_t qdata); -void hg_mem_unlock_object (hg_mem_t *mem, - hg_quark_t qdata); -hg_bool_t hg_mem_gc_mark (hg_mem_t *mem, - hg_quark_t qdata); -hg_int_t hg_mem_get_id (hg_mem_t *mem); -void hg_mem_ref (hg_mem_t *mem, - hg_quark_t qdata); -void hg_mem_unref (hg_mem_t *mem, - hg_quark_t qdata); -hg_bool_t hg_mem_foreach (hg_mem_t *mem, - hg_block_iter_flags_t flags, - hg_quark_iterator_func_t func, - hg_pointer_t user_data); +hg_quark_t hg_mem_alloc (hg_mem_t *mem, + hg_usize_t size, + hg_pointer_t *ret); +hg_quark_t hg_mem_alloc_with_flags(hg_mem_t *mem, + hg_usize_t size, + hg_uint_t flags, + hg_pointer_t *ret); +hg_quark_t hg_mem_realloc (hg_mem_t *mem, + hg_quark_t qdata, + hg_usize_t size, + hg_pointer_t *ret); +void hg_mem_free (hg_mem_t *mem, + hg_quark_t qdata); +void hg_mem_set_gc_marker (hg_mem_t *mem, + hg_quark_t qdata, + hg_int_t marker_id); +void hg_mem_set_finalizer (hg_mem_t *mem, + hg_quark_t qdata, + hg_int_t finalizer_id); +hg_pointer_t hg_mem_lock_object (hg_mem_t *mem, + hg_quark_t qdata); +void hg_mem_unlock_object (hg_mem_t *mem, + hg_quark_t qdata); +hg_bool_t hg_mem_gc_mark (hg_mem_t *mem, + hg_quark_t qdata); +hg_int_t hg_mem_get_id (hg_mem_t *mem); +void hg_mem_ref (hg_mem_t *mem, + hg_quark_t qdata); +void hg_mem_unref (hg_mem_t *mem, + hg_quark_t qdata); +hg_bool_t hg_mem_foreach (hg_mem_t *mem, + hg_block_iter_flags_t flags, + hg_block_iter_func_t func, + hg_pointer_t user_data); HG_INLINE_FUNC hg_pointer_t _hg_mem_lock_object(hg_mem_t *mem, |