summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Vollmer <mvo@zagadka.de>2002-02-11 18:09:15 +0000
committerMarius Vollmer <mvo@zagadka.de>2002-02-11 18:09:15 +0000
commit6c70aef189c19d6166fd7fedff771ecc304f246c (patch)
treeb7ba2b05274fe287adb1b6a92e29b0e764e5068e
parent4c9419ac31f8364db51ccf25f7f9d5d31dd412e7 (diff)
downloadguile-6c70aef189c19d6166fd7fedff771ecc304f246c.tar.gz
Use scm_gc_malloc/scm_malloc and scm_gc_free/free instead of
scm_must_malloc and scm_must_free, as appropriate.
-rw-r--r--srfi/srfi-14.c2
-rw-r--r--srfi/srfi-4.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/srfi/srfi-14.c b/srfi/srfi-14.c
index 1f3abae7d..e16f2337f 100644
--- a/srfi/srfi-14.c
+++ b/srfi/srfi-14.c
@@ -99,7 +99,7 @@ make_char_set (const char * func_name)
{
long * p;
- p = scm_must_malloc (BYTES_PER_CHARSET, func_name);
+ p = scm_gc_malloc (BYTES_PER_CHARSET, "character-set");
memset (p, 0, BYTES_PER_CHARSET);
SCM_RETURN_NEWSMOB (scm_tc16_charset, p);
}
diff --git a/srfi/srfi-4.c b/srfi/srfi-4.c
index 9ecd8b167..c059707d0 100644
--- a/srfi/srfi-4.c
+++ b/srfi/srfi-4.c
@@ -346,8 +346,10 @@ uvec_print (SCM uvec, SCM port, scm_print_state *pstate SCM_UNUSED)
static size_t
uvec_free (SCM uvec)
{
- scm_must_free (SCM_UVEC_BASE (uvec));
- return SCM_UVEC_LENGTH (uvec) * uvec_sizes[SCM_UVEC_TYPE (uvec)];
+ scm_gc_free (SCM_UVEC_BASE (uvec),
+ SCM_UVEC_LENGTH (uvec) * uvec_sizes[SCM_UVEC_TYPE (uvec)],
+ "uvec");
+ return 0;
}
@@ -363,7 +365,7 @@ make_uvec (const char * func_name, int type, int len)
{
void * p;
- p = scm_must_malloc (len * uvec_sizes[type], func_name);
+ p = scm_gc_malloc (len * uvec_sizes[type], "uvec");
SCM_RETURN_NEWSMOB3 (scm_tc16_uvec, type, len, p);
}