diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-01-18 15:33:37 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-01-18 16:02:04 +0100 |
| commit | 2a77682322b3d466ac16ce4bd1244d29085a3555 (patch) | |
| tree | 6dba438ea995f5b4372af882cb6758a239f15b62 /libguile/dynl.c | |
| parent | 33ed7a1644eda55a8dc479acf26418631cb937f9 (diff) | |
| download | guile-2a77682322b3d466ac16ce4bd1244d29085a3555.tar.gz | |
Use `scm_gc malloc_pointerless ()' in `scm_i allocate_string_pointers ()'.
* libguile/dynl.c (free_string_pointers): Remove.
(scm_dynamic_args_call): Remove reference to `free_string_pointers ()'
and remove dynwind.
* libguile/posix.c (free_string_pointers): Remove.
(scm_execl, scm_execlp, scm_execle, scm_environ): Remove references
to `free_string_pointers ()'.
* libguile/simpos.c (free_string_pointers): Remove.
(scm_system_star): Remove reference to `free_string_pointers ()',
remove enclosing dynwind.
* libguile/strings.c (scm_i_allocate_string_pointers): Use
`scm_gc_malloc_pointerless ()' and `scm_gc_malloc ()'
instead of `scm_malloc ()' and `scm_to_locale_string ()',
so that the result is automatically GC'd when no longer
referenced. Remove unneeded dynwind.
(scm_i_free_string_pointers): Remove.
* libguile/strings.h (scm_i_free_string_pointers): Remove declaration.
Diffstat (limited to 'libguile/dynl.c')
| -rw-r--r-- | libguile/dynl.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/libguile/dynl.c b/libguile/dynl.c index 42fd3955b..1326b8bd4 100644 --- a/libguile/dynl.c +++ b/libguile/dynl.c @@ -1,7 +1,7 @@ /* dynl.c - dynamic linking * * Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002, - * 2003, 2008 Free Software Foundation, Inc. + * 2003, 2008, 2009 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -262,12 +262,6 @@ SCM_DEFINE (scm_dynamic_call, "dynamic-call", 2, 0, 0, } #undef FUNC_NAME -static void -free_string_pointers (void *data) -{ - scm_i_free_string_pointers ((char **)data); -} - SCM_DEFINE (scm_dynamic_args_call, "dynamic-args-call", 3, 0, 0, (SCM func, SCM dobj, SCM args), "Call the C function indicated by @var{func} and @var{dobj},\n" @@ -288,21 +282,16 @@ SCM_DEFINE (scm_dynamic_args_call, "dynamic-args-call", 3, 0, 0, int result, argc; char **argv; - scm_dynwind_begin (0); - if (scm_is_string (func)) func = scm_dynamic_func (func, dobj); fptr = (int (*) (int, char **)) scm_to_ulong (func); argv = scm_i_allocate_string_pointers (args); - scm_dynwind_unwind_handler (free_string_pointers, argv, - SCM_F_WIND_EXPLICITLY); for (argc = 0; argv[argc]; argc++) ; result = (*fptr) (argc, argv); - scm_dynwind_end (); return scm_from_int (result); } #undef FUNC_NAME |