diff options
author | Andy Wingo <wingo@pobox.com> | 2012-02-19 12:23:29 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-02-19 20:46:14 +0100 |
commit | 6978c673393a960d7caf604b8c72ff2b5fe0f4ec (patch) | |
tree | f768bd982fed6c784aada48070518c1eb2f13bb9 /libguile/foreign.c | |
parent | 6e9ec86dc0dad255ac120e1a5e77e10f1c544fbc (diff) | |
download | guile-6978c673393a960d7caf604b8c72ff2b5fe0f4ec.tar.gz |
use the new finalizer helpers
* libguile/foreign.c (scm_set_pointer_finalizer_x)
* libguile/ports.c (finalize_port, scm_c_make_port_with_encoding)
(open_iconv_descriptors)
* libguile/smob.c (scm_i_new_smob, scm_i_new_double_smob)
* libguile/struct.c (scm_i_alloc_struct)
* libguile/weak-set.c (weak_gc_finalizer)
(scm_c_register_weak_gc_callback)
* libguile/weak-table.c (scm_c_register_weak_gc_callback)
(weak_gc_finalizer)
* libguile/numbers.c (make_bignum): Use the new API.
Diffstat (limited to 'libguile/foreign.c')
-rw-r--r-- | libguile/foreign.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/libguile/foreign.c b/libguile/foreign.c index 33df96386..00e9c7544 100644 --- a/libguile/foreign.c +++ b/libguile/foreign.c @@ -157,16 +157,8 @@ scm_from_pointer (void *ptr, scm_t_pointer_finalizer finalizer) ret = scm_cell (scm_tc7_pointer, (scm_t_bits) ptr); if (finalizer) - { - /* Register a finalizer for the newly created instance. */ - GC_finalization_proc prev_finalizer; - GC_PTR prev_finalizer_data; - GC_REGISTER_FINALIZER_NO_ORDER (SCM2PTR (ret), - pointer_finalizer_trampoline, - finalizer, - &prev_finalizer, - &prev_finalizer_data); - } + scm_i_set_finalizer (SCM2PTR (ret), pointer_finalizer_trampoline, + finalizer); } return ret; @@ -316,20 +308,11 @@ SCM_DEFINE (scm_set_pointer_finalizer_x, "set-pointer-finalizer!", 2, 0, 0, "Scheme. If you need a Scheme finalizer, use guardians.") #define FUNC_NAME s_scm_set_pointer_finalizer_x { - void *c_finalizer; - GC_finalization_proc prev_finalizer; - GC_PTR prev_finalizer_data; - SCM_VALIDATE_POINTER (1, pointer); SCM_VALIDATE_POINTER (2, finalizer); - c_finalizer = SCM_POINTER_VALUE (finalizer); - - GC_REGISTER_FINALIZER_NO_ORDER (SCM2PTR (pointer), - pointer_finalizer_trampoline, - c_finalizer, - &prev_finalizer, - &prev_finalizer_data); + scm_i_add_finalizer (SCM2PTR (pointer), pointer_finalizer_trampoline, + SCM_POINTER_VALUE (finalizer)); return SCM_UNSPECIFIED; } |