diff options
author | Marius Vollmer <mvo@zagadka.de> | 2006-01-29 00:23:28 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 2006-01-29 00:23:28 +0000 |
commit | 661ae7ab6be5aec4d6107902cff94dbb8952a24a (patch) | |
tree | d3e367c7f0dfd442645c5c2e1c87f4f4a7fc54c5 /libguile/dynl.c | |
parent | 15ccf10bf2d7cb15ec46f2eb62c6eb86827c9108 (diff) | |
download | guile-661ae7ab6be5aec4d6107902cff94dbb8952a24a.tar.gz |
Renamed the "frames" that are related to dynamic-wind to "dynamic
contexts. Renamed all functions from scm_frame_ to scm_dynwind_.
Updated documentation.
Diffstat (limited to 'libguile/dynl.c')
-rw-r--r-- | libguile/dynl.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libguile/dynl.c b/libguile/dynl.c index ea5ef8d9a..be9f6910f 100644 --- a/libguile/dynl.c +++ b/libguile/dynl.c @@ -153,11 +153,11 @@ SCM_DEFINE (scm_dynamic_link, "dynamic-link", 1, 0, 0, void *handle; char *file; - scm_frame_begin (0); + scm_dynwind_begin (0); file = scm_to_locale_string (filename); - scm_frame_free (file); + scm_dynwind_free (file); handle = sysdep_dynl_link (file, FUNC_NAME); - scm_frame_end (); + scm_dynwind_end (); SCM_RETURN_NEWSMOB2 (scm_tc16_dynamic_obj, SCM_UNPACK (filename), handle); } #undef FUNC_NAME @@ -222,12 +222,12 @@ SCM_DEFINE (scm_dynamic_func, "dynamic-func", 2, 0, 0, } else { char *chars; - scm_frame_begin (0); + scm_dynwind_begin (0); chars = scm_to_locale_string (name); - scm_frame_free (chars); + scm_dynwind_free (chars); func = (void (*) ()) sysdep_dynl_func (chars, DYNL_HANDLE (dobj), FUNC_NAME); - scm_frame_end (); + scm_dynwind_end (); return scm_from_ulong ((unsigned long) func); } } @@ -290,7 +290,7 @@ SCM_DEFINE (scm_dynamic_args_call, "dynamic-args-call", 3, 0, 0, int result, argc; char **argv; - scm_frame_begin (0); + scm_dynwind_begin (0); if (scm_is_string (func)) func = scm_dynamic_func (func, dobj); @@ -298,13 +298,13 @@ SCM_DEFINE (scm_dynamic_args_call, "dynamic-args-call", 3, 0, 0, fptr = (int (*) (int, char **)) scm_to_ulong (func); argv = scm_i_allocate_string_pointers (args); - scm_frame_unwind_handler (free_string_pointers, argv, - SCM_F_WIND_EXPLICITLY); + scm_dynwind_unwind_handler (free_string_pointers, argv, + SCM_F_WIND_EXPLICITLY); for (argc = 0; argv[argc]; argc++) ; result = (*fptr) (argc, argv); - scm_frame_end (); + scm_dynwind_end (); return scm_from_int (result); } #undef FUNC_NAME |