summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Djurfeldt <djurfeldt@nada.kth.se>1998-07-12 00:10:02 +0000
committerMikael Djurfeldt <djurfeldt@nada.kth.se>1998-07-12 00:10:02 +0000
commita8741caa54fa6fc14bc290c40cc97361db850953 (patch)
tree0cc6d2e9e5f5dc6c85497eb51de3b5339dec95b6
parenta61ef59b0bb8c556d2ffb950b7f24674cd61034b (diff)
downloadguile-a8741caa54fa6fc14bc290c40cc97361db850953.tar.gz
* eval.c, filesys.c, fluids.c, gc.c, gh_data.c, init.c, kw.c,
net_db.c, posix.c, print.c, regex-posix.c, scmsigs.c, socket.c, stime.c, symbols.c, unif.c, vectors.c, weaks.c: Removed third argument in call to scm_make_vector.
-rw-r--r--libguile/eval.c2
-rw-r--r--libguile/filesys.c2
-rw-r--r--libguile/fluids.c5
-rw-r--r--libguile/gc.c6
-rw-r--r--libguile/gh_data.c5
-rw-r--r--libguile/init.c3
-rw-r--r--libguile/kw.c2
-rw-r--r--libguile/net_db.c8
-rw-r--r--libguile/posix.c8
-rw-r--r--libguile/print.c1
-rw-r--r--libguile/regex-posix.c3
-rw-r--r--libguile/scmsigs.c1
-rw-r--r--libguile/socket.c4
-rw-r--r--libguile/stime.c4
-rw-r--r--libguile/symbols.c2
-rw-r--r--libguile/unif.c4
-rw-r--r--libguile/weaks.c2
17 files changed, 27 insertions, 35 deletions
diff --git a/libguile/eval.c b/libguile/eval.c
index 55eda7a3d..1a598105f 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -3395,7 +3395,7 @@ scm_copy_tree (obj)
if (SCM_VECTORP (obj))
{
scm_sizet i = SCM_LENGTH (obj);
- ans = scm_make_vector (SCM_MAKINUM (i), SCM_UNSPECIFIED, SCM_UNDEFINED);
+ ans = scm_make_vector (SCM_MAKINUM (i), SCM_UNSPECIFIED);
while (i--)
SCM_VELTS (ans)[i] = scm_copy_tree (SCM_VELTS (obj)[i]);
return ans;
diff --git a/libguile/filesys.c b/libguile/filesys.c
index 6bff65346..dff946f08 100644
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -331,7 +331,7 @@ static SCM
scm_stat2scm (stat_temp)
struct stat *stat_temp;
{
- SCM ans = scm_make_vector (SCM_MAKINUM (15), SCM_UNSPECIFIED, SCM_BOOL_F);
+ SCM ans = scm_make_vector (SCM_MAKINUM (15), SCM_UNSPECIFIED);
SCM *ve = SCM_VELTS (ans);
ve[0] = scm_ulong2num ((unsigned long) stat_temp->st_dev);
diff --git a/libguile/fluids.c b/libguile/fluids.c
index 225709c92..c07d01d9d 100644
--- a/libguile/fluids.c
+++ b/libguile/fluids.c
@@ -56,7 +56,7 @@ SCM
scm_make_initial_fluids ()
{
return scm_make_vector (SCM_MAKINUM (INITIAL_FLUIDS),
- SCM_BOOL_F, SCM_BOOL_F);
+ SCM_BOOL_F);
}
static void grow_fluids SCM_P ((scm_root_state *, int new_length));
@@ -70,8 +70,7 @@ grow_fluids (root_state, new_length)
old_fluids = root_state->fluids;
old_length = SCM_LENGTH (old_fluids);
- new_fluids = scm_make_vector (SCM_MAKINUM (new_length),
- SCM_BOOL_F, SCM_BOOL_F);
+ new_fluids = scm_make_vector (SCM_MAKINUM (new_length), SCM_BOOL_F);
i = 0;
while (i < old_length)
{
diff --git a/libguile/gc.c b/libguile/gc.c
index 8a65fb0b5..0cf3a0873 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -1869,10 +1869,10 @@ scm_init_storage (init_heap_size)
scm_listofnull = scm_cons (SCM_EOL, SCM_EOL);
scm_nullstr = scm_makstr (0L, 0);
- scm_nullvect = scm_make_vector (SCM_INUM0, SCM_UNDEFINED, SCM_UNDEFINED);
- scm_symhash = scm_make_vector ((SCM) SCM_MAKINUM (scm_symhash_dim), SCM_EOL, SCM_UNDEFINED);
+ scm_nullvect = scm_make_vector (SCM_INUM0, SCM_UNDEFINED);
+ scm_symhash = scm_make_vector ((SCM) SCM_MAKINUM (scm_symhash_dim), SCM_EOL);
scm_weak_symhash = scm_make_weak_key_hash_table ((SCM) SCM_MAKINUM (scm_symhash_dim));
- scm_symhash_vars = scm_make_vector ((SCM) SCM_MAKINUM (scm_symhash_dim), SCM_EOL, SCM_UNDEFINED);
+ scm_symhash_vars = scm_make_vector ((SCM) SCM_MAKINUM (scm_symhash_dim), SCM_EOL);
scm_stand_in_procs = SCM_EOL;
scm_permobjs = SCM_EOL;
scm_protects = SCM_EOL;
diff --git a/libguile/gh_data.c b/libguile/gh_data.c
index f2866e39a..92a70d3ca 100644
--- a/libguile/gh_data.c
+++ b/libguile/gh_data.c
@@ -352,10 +352,7 @@ gh_symbol2newstr (SCM sym, int *lenp)
SCM
gh_make_vector (SCM len, SCM fill)
{
- /* scm_make_vector() takes a third boolean argument which should be
- set to SCM_BOOL_T when you are dealing with multi-dimensional
- arrays; gh_make_vector() does not do multi-dimensional arrays */
- return scm_make_vector(len, fill, SCM_BOOL_F);
+ return scm_make_vector (len, fill);
}
/* set the given element of the given vector to the given value */
diff --git a/libguile/init.c b/libguile/init.c
index 4eb3d5716..030e02452 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -159,8 +159,7 @@ start_stack (base)
/* Create the look-aside stack for variables that are shared between
* captured continuations.
*/
- scm_continuation_stack = scm_make_vector (SCM_MAKINUM (512),
- SCM_UNDEFINED, SCM_UNDEFINED);
+ scm_continuation_stack = scm_make_vector (SCM_MAKINUM (512), SCM_UNDEFINED);
/* The continuation stack is further initialized by restart_stack. */
/* The remainder of stack initialization is factored out to another
diff --git a/libguile/kw.c b/libguile/kw.c
index ce3c6dc05..848e8f8d8 100644
--- a/libguile/kw.c
+++ b/libguile/kw.c
@@ -137,7 +137,7 @@ void
scm_init_kw ()
{
scm_tc16_kw = scm_newsmob (&kw_smob);
- scm_kw_obarray = scm_make_vector (SCM_MAKINUM (256), SCM_EOL, SCM_UNDEFINED);
+ scm_kw_obarray = scm_make_vector (SCM_MAKINUM (256), SCM_EOL);
#include "kw.x"
}
diff --git a/libguile/net_db.c b/libguile/net_db.c
index 3bf47cdca..71121a174 100644
--- a/libguile/net_db.c
+++ b/libguile/net_db.c
@@ -165,7 +165,7 @@ SCM
scm_gethost (name)
SCM name;
{
- SCM ans = scm_make_vector (SCM_MAKINUM (5), SCM_UNSPECIFIED, SCM_BOOL_F);
+ SCM ans = scm_make_vector (SCM_MAKINUM (5), SCM_UNSPECIFIED);
SCM *ve = SCM_VELTS (ans);
SCM lst = SCM_EOL;
struct hostent *entry;
@@ -260,7 +260,7 @@ scm_getnet (name)
SCM *ve;
struct netent *entry;
- ans = scm_make_vector (SCM_MAKINUM (4), SCM_UNSPECIFIED, SCM_BOOL_F);
+ ans = scm_make_vector (SCM_MAKINUM (4), SCM_UNSPECIFIED);
ve = SCM_VELTS (ans);
if (SCM_UNBNDP (name))
{
@@ -312,7 +312,7 @@ scm_getproto (name)
SCM *ve;
struct protoent *entry;
- ans = scm_make_vector (SCM_MAKINUM (3), SCM_UNSPECIFIED, SCM_BOOL_F);
+ ans = scm_make_vector (SCM_MAKINUM (3), SCM_UNSPECIFIED);
ve = SCM_VELTS (ans);
if (SCM_UNBNDP (name))
{
@@ -361,7 +361,7 @@ scm_return_entry (entry)
SCM ans;
SCM *ve;
- ans = scm_make_vector (SCM_MAKINUM (4), SCM_UNSPECIFIED, SCM_BOOL_F);
+ ans = scm_make_vector (SCM_MAKINUM (4), SCM_UNSPECIFIED);
ve = SCM_VELTS (ans);
ve[0] = scm_makfromstr (entry->s_name, (scm_sizet) strlen (entry->s_name), 0);
ve[1] = scm_makfromstrs (-1, entry->s_aliases);
diff --git a/libguile/posix.c b/libguile/posix.c
index 6ae76daaa..585b2471d 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -234,7 +234,7 @@ scm_getgroups()
SCM_SETCHARS(grps, groups); /* set up grps as a GC protect */
SCM_SETLENGTH(grps, 0L + ngroups * sizeof(GETGROUPS_T), scm_tc7_string);
SCM_ALLOW_INTS;
- ans = scm_make_vector(SCM_MAKINUM(ngroups), SCM_UNDEFINED, SCM_BOOL_F);
+ ans = scm_make_vector (SCM_MAKINUM(ngroups), SCM_UNDEFINED);
while (--ngroups >= 0) SCM_VELTS(ans)[ngroups] = SCM_MAKINUM(groups[ngroups]);
SCM_SETCHARS(grps, groups); /* to make sure grps stays around. */
return ans;
@@ -253,7 +253,7 @@ scm_getpwuid (user)
struct passwd *entry;
SCM *ve;
- result = scm_make_vector (SCM_MAKINUM (7), SCM_UNSPECIFIED, SCM_BOOL_F);
+ result = scm_make_vector (SCM_MAKINUM (7), SCM_UNSPECIFIED);
ve = SCM_VELTS (result);
if (SCM_UNBNDP (user) || SCM_FALSEP (user))
{
@@ -326,7 +326,7 @@ scm_getgrgid (name)
SCM result;
struct group *entry;
SCM *ve;
- result = scm_make_vector (SCM_MAKINUM (4), SCM_UNSPECIFIED, SCM_BOOL_F);
+ result = scm_make_vector (SCM_MAKINUM (4), SCM_UNSPECIFIED);
ve = SCM_VELTS (result);
SCM_DEFER_INTS;
if (SCM_UNBNDP (name) || (name == SCM_BOOL_F))
@@ -873,7 +873,7 @@ scm_uname ()
{
#ifdef HAVE_UNAME
struct utsname buf;
- SCM ans = scm_make_vector(SCM_MAKINUM(5), SCM_UNSPECIFIED, SCM_BOOL_F);
+ SCM ans = scm_make_vector (SCM_MAKINUM(5), SCM_UNSPECIFIED);
SCM *ve = SCM_VELTS (ans);
SCM_DEFER_INTS;
if (uname (&buf) < 0)
diff --git a/libguile/print.c b/libguile/print.c
index cdd4b892b..2d8c7609e 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -180,7 +180,6 @@ make_print_state ()
SCM_EOL);
scm_print_state *pstate = SCM_PRINT_STATE (print_state);
pstate->ref_vect = scm_make_vector (SCM_MAKINUM (PSTATE_SIZE),
- SCM_UNDEFINED,
SCM_UNDEFINED);
pstate->ref_stack = SCM_VELTS (pstate->ref_vect);
pstate->ceiling = SCM_LENGTH (pstate->ref_vect);
diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c
index 0b63a3ea8..f72efe455 100644
--- a/libguile/regex-posix.c
+++ b/libguile/regex-posix.c
@@ -249,8 +249,7 @@ scm_regexp_exec (SCM rx, SCM str, SCM start, SCM flags)
int i;
/* The match vector must include a cell for the string that was matched,
so add 1. */
- mvec = scm_make_vector (SCM_MAKINUM (nmatches + 1), SCM_UNSPECIFIED,
- SCM_UNDEFINED);
+ mvec = scm_make_vector (SCM_MAKINUM (nmatches + 1), SCM_UNSPECIFIED);
SCM_VELTS(mvec)[0] = str;
for (i = 0; i < nmatches; ++i)
SCM_VELTS(mvec)[i+1] = scm_cons(SCM_MAKINUM(matches[i].rm_so + offset),
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index ac1815170..9db15d2b3 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -405,7 +405,6 @@ scm_init_scmsigs ()
signal_handlers =
SCM_CDRLOC (scm_sysintern ("signal-handlers",
scm_make_vector (SCM_MAKINUM (NSIG),
- SCM_BOOL_F,
SCM_BOOL_F)));
thunk = scm_make_gsubr ("%deliver-signals", 0, 0, 0,
sys_deliver_signals);
diff --git a/libguile/socket.c b/libguile/socket.c
index d1f59c122..7f8077556 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -462,7 +462,7 @@ scm_addr_vector (address, proc)
if (fam == AF_UNIX)
{
struct sockaddr_un *nad = (struct sockaddr_un *) address;
- result = scm_make_vector (SCM_MAKINUM (2), SCM_UNSPECIFIED, SCM_BOOL_F);
+ result = scm_make_vector (SCM_MAKINUM (2), SCM_UNSPECIFIED);
ve = SCM_VELTS (result);
ve[0] = scm_ulong2num ((unsigned long) fam);
ve[1] = scm_makfromstr (nad->sun_path,
@@ -473,7 +473,7 @@ scm_addr_vector (address, proc)
if (fam == AF_INET)
{
struct sockaddr_in *nad = (struct sockaddr_in *) address;
- result = scm_make_vector (SCM_MAKINUM (3), SCM_UNSPECIFIED, SCM_BOOL_F);
+ result = scm_make_vector (SCM_MAKINUM (3), SCM_UNSPECIFIED);
ve = SCM_VELTS (result);
ve[0] = scm_ulong2num ((unsigned long) fam);
ve[1] = scm_ulong2num (ntohl (nad->sin_addr.s_addr));
diff --git a/libguile/stime.c b/libguile/stime.c
index 1b181ed10..7afabe786 100644
--- a/libguile/stime.c
+++ b/libguile/stime.c
@@ -167,7 +167,7 @@ scm_times (void)
struct tms t;
clock_t rv;
- SCM result = scm_make_vector (SCM_MAKINUM(5), SCM_UNDEFINED, SCM_UNDEFINED);
+ SCM result = scm_make_vector (SCM_MAKINUM(5), SCM_UNDEFINED);
rv = times (&t);
if (rv == -1)
scm_syserror (s_times);
@@ -245,7 +245,7 @@ scm_gettimeofday (void)
static SCM
filltime (struct tm *bd_time, int zoff, char *zname)
{
- SCM result = scm_make_vector(SCM_MAKINUM(11), SCM_UNDEFINED, SCM_UNDEFINED);
+ SCM result = scm_make_vector (SCM_MAKINUM(11), SCM_UNDEFINED);
SCM_VELTS (result)[0] = SCM_MAKINUM (bd_time->tm_sec);
SCM_VELTS (result)[1] = SCM_MAKINUM (bd_time->tm_min);
diff --git a/libguile/symbols.c b/libguile/symbols.c
index 8f291788c..989899054 100644
--- a/libguile/symbols.c
+++ b/libguile/symbols.c
@@ -795,7 +795,7 @@ SCM
scm_builtin_bindings ()
{
int length = SCM_LENGTH (scm_symhash);
- SCM obarray = scm_make_vector (SCM_MAKINUM (length), SCM_EOL, SCM_UNDEFINED);
+ SCM obarray = scm_make_vector (SCM_MAKINUM (length), SCM_EOL);
copy_and_prune_obarray (scm_symhash, obarray);
return obarray;
}
diff --git a/libguile/unif.c b/libguile/unif.c
index fb83cee72..fd1d752b9 100644
--- a/libguile/unif.c
+++ b/libguile/unif.c
@@ -242,7 +242,7 @@ scm_make_uve (k, prot)
#endif
else
{
- return scm_make_vector (SCM_MAKINUM (k), SCM_UNDEFINED, SCM_UNDEFINED);
+ return scm_make_vector (SCM_MAKINUM (k), SCM_UNDEFINED);
}
}
else
@@ -250,7 +250,7 @@ scm_make_uve (k, prot)
if (SCM_IMP (prot) || !SCM_INEXP (prot))
#endif
/* Huge non-unif vectors are NOT supported. */
- return scm_make_vector (SCM_MAKINUM (k), SCM_UNDEFINED, SCM_UNDEFINED); /* no special scm_vector */
+ return scm_make_vector (SCM_MAKINUM (k), SCM_UNDEFINED); /* no special scm_vector */
#ifdef SCM_FLOATS
#ifdef SCM_SINGLES
else if (SCM_SINGP (prot))
diff --git a/libguile/weaks.c b/libguile/weaks.c
index 5a79c8591..56da63845 100644
--- a/libguile/weaks.c
+++ b/libguile/weaks.c
@@ -58,7 +58,7 @@ scm_make_weak_vector (k, fill)
SCM fill;
{
SCM v;
- v = scm_make_vector (scm_sum (k, SCM_MAKINUM (1)), fill, SCM_UNDEFINED);
+ v = scm_make_vector (scm_sum (k, SCM_MAKINUM (1)), fill);
SCM_DEFER_INTS;
SCM_SETLENGTH(v, SCM_INUM (k), scm_tc7_wvect);
SCM_VELTS(v)[0] = (SCM)0;