summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-12-08 21:50:40 +0100
committerAndy Wingo <wingo@pobox.com>2009-12-08 23:13:20 +0100
commit96a44c1cab34e2cc3cf5a04a0c026f0863386137 (patch)
tree2f009997e69e10edd75ebf2a12c9c246780ed515
parent485d13670be5ae5594cf04d87fb64c239c2c9b80 (diff)
downloadguile-96a44c1cab34e2cc3cf5a04a0c026f0863386137.tar.gz
scm_i_alloc_struct does not take a "what" arg
* libguile/struct.h: * libguile/struct.c (scm_i_alloc_struct): Change to not take a "what" argument. Callers changed.
-rw-r--r--libguile/goops.c2
-rw-r--r--libguile/struct.c7
-rw-r--r--libguile/struct.h2
3 files changed, 5 insertions, 6 deletions
diff --git a/libguile/goops.c b/libguile/goops.c
index 1472e4700..a402fc557 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -1431,7 +1431,7 @@ SCM_DEFINE (scm_sys_allocate_instance, "%allocate-instance", 2, 0, 0,
/* FIXME: duplicates some of scm_make_struct. */
n = SCM_I_INUM (SCM_SLOT (class, scm_si_nfields));
- obj = scm_i_alloc_struct (SCM_STRUCT_DATA (class), n, "struct");
+ obj = scm_i_alloc_struct (SCM_STRUCT_DATA (class), n);
layout = SCM_VTABLE_LAYOUT (class);
diff --git a/libguile/struct.c b/libguile/struct.c
index 8e83bce3b..321f2f199 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -321,7 +321,7 @@ struct_finalizer_trampoline (GC_PTR ptr, GC_PTR unused_data)
points to the given vtable data, then a data pointer, then n_words of data.
*/
SCM
-scm_i_alloc_struct (scm_t_bits *vtable_data, int n_words, const char *what)
+scm_i_alloc_struct (scm_t_bits *vtable_data, int n_words)
{
scm_t_bits ret;
ret = (scm_t_bits)scm_gc_malloc (sizeof (scm_t_bits) * (n_words + 2), "struct");
@@ -376,8 +376,7 @@ scm_c_make_structv (SCM vtable, size_t n_tail, size_t n_init, scm_t_bits *init)
goto bad_tail;
}
- obj = scm_i_alloc_struct (SCM_STRUCT_DATA (vtable), basic_size + n_tail,
- "struct");
+ obj = scm_i_alloc_struct (SCM_STRUCT_DATA (vtable), basic_size + n_tail);
scm_struct_init (obj, layout, n_tail, n_init, init);
@@ -539,7 +538,7 @@ SCM_DEFINE (scm_make_vtable_vtable, "make-vtable-vtable", 2, 0, 1,
v[i] = SCM_UNPACK (SCM_CAR (init));
SCM_CRITICAL_SECTION_START;
- obj = scm_i_alloc_struct (NULL, basic_size + n_tail, "struct");
+ obj = scm_i_alloc_struct (NULL, basic_size + n_tail);
/* magic magic magic */
SCM_SET_CELL_WORD_0 (obj, (scm_t_bits)SCM_STRUCT_DATA (obj) | scm_tc3_struct);
SCM_CRITICAL_SECTION_END;
diff --git a/libguile/struct.h b/libguile/struct.h
index 5454297eb..537ef90ed 100644
--- a/libguile/struct.h
+++ b/libguile/struct.h
@@ -170,7 +170,7 @@ SCM_API void scm_print_struct (SCM exp, SCM port, scm_print_state *);
SCM_INTERNAL SCM scm_i_struct_equalp (SCM s1, SCM s2);
SCM_INTERNAL unsigned long scm_struct_ihashq (SCM, unsigned long, void *);
-SCM_INTERNAL SCM scm_i_alloc_struct (scm_t_bits *vtable_data, int n_words, const char *what);
+SCM_INTERNAL SCM scm_i_alloc_struct (scm_t_bits *vtable_data, int n_words);
SCM_INTERNAL void scm_i_struct_inherit_vtable_magic (SCM vtable, SCM obj);
SCM_INTERNAL void scm_init_struct (void);