summaryrefslogtreecommitdiff
path: root/libguile/struct.c
diff options
context:
space:
mode:
authorDirk Herrmann <dirk@dirk-herrmanns-seiten.de>2000-10-25 11:01:03 +0000
committerDirk Herrmann <dirk@dirk-herrmanns-seiten.de>2000-10-25 11:01:03 +0000
commitd1ca2c64230419163f7ad80436e83bd74fdb7b95 (patch)
treec3536f600b54e7c3db4bcc042354b4c43522f15e /libguile/struct.c
parent31535422f5aa27febb86fbbf1030c2e2aa35e9f1 (diff)
downloadguile-d1ca2c64230419163f7ad80436e83bd74fdb7b95.tar.gz
* Some more work to get rid of SCM_LENGTH
* Eliminated some cell type bit fiddling * Various minor changes
Diffstat (limited to 'libguile/struct.c')
-rw-r--r--libguile/struct.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/struct.c b/libguile/struct.c
index 16e31af9c..a47358516 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -81,13 +81,13 @@ SCM_DEFINE (scm_make_struct_layout, "make-struct-layout", 1, 0, 0,
#define FUNC_NAME s_scm_make_struct_layout
{
SCM new_sym;
- SCM_VALIDATE_STRINGORSUBSTR (1, fields);
+ SCM_VALIDATE_STRING (1, fields);
{ /* scope */
char * field_desc;
int len;
int x;
- len = SCM_ROLENGTH (fields);
+ len = SCM_STRING_LENGTH (fields);
field_desc = SCM_ROCHARS (fields);
SCM_ASSERT (!(len & 1), fields, "odd length field specification", FUNC_NAME);
@@ -524,7 +524,7 @@ SCM_DEFINE (scm_make_vtable_vtable, "make-vtable-vtable", 2, 0, 1,
scm_bits_t * data;
SCM handle;
- SCM_VALIDATE_STRINGORSUBSTR (1, user_fields);
+ SCM_VALIDATE_STRING (1, user_fields);
SCM_VALIDATE_INUM (2, tail_array_size);
SCM_VALIDATE_REST_ARGUMENT (init);