mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-07-02 23:50:47 +02:00
Code Activity

Fix a couple SCM_SIMPLE_VECTOR stragglers

Browse source 
* libguile/filesys.c (retrieve_select_type):
* libguile/hashtab.c (rehash):
* libguile/posix.c (scm_uname):
* libguile/vectors.c (scm_c_vector_set_x):
(scm_c_make_vector): Fix some SCM_SIMPLE_VECTOR users.
This commit is contained in:
Andy Wingo 2025-06-24 10:44:33 +02:00
parent 617344f822
commit da51198ce8
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libguile/filesys.c
View file

@ -885,7 +885,7 @@ retrieve_select_type (fd_set *set, SCM ports_ready, SCM list_or_vec)
if (scm_is_vector (list_or_vec)) if (scm_is_vector (list_or_vec))
{ {
int i = SCM_SIMPLE_VECTOR_LENGTH (list_or_vec); int i = scm_c_vector_length (list_or_vec);
while (--i >= 0) while (--i >= 0)
{ {

2
libguile/hashtab.c
View file

@ -610,7 +610,7 @@ rehash (struct scm_t_hashtable *table, scm_t_hash_fn hash_fn,
table->buckets = new_buckets; table->buckets = new_buckets;
table->n_items = 0; table->n_items = 0;
size_t old_size = SCM_SIMPLE_VECTOR_LENGTH (buckets); size_t old_size = scm_c_vector_length (buckets);
for (i = 0; i < old_size; ++i) for (i = 0; i < old_size; ++i)
{ {
SCM ls = scm_c_vector_ref (buckets, i); SCM ls = scm_c_vector_ref (buckets, i);

2
libguile/posix.c
View file

@ -1767,7 +1767,7 @@ SCM_DEFINE (scm_uname, "uname", 0, 0, 0,
scm_c_vector_set_x (result, 4, scm_from_locale_string (buf.machine)); scm_c_vector_set_x (result, 4, scm_from_locale_string (buf.machine));
/* /*
a linux special? a linux special?
SCM_SIMPLE_VECTOR_SET(result, 5, scm_from_locale_string (buf.domainname)); scm_c_vector_set_x (result, 5, scm_from_locale_string (buf.domainname));
*/ */
return result; return result;
} }

8
libguile/vectors.c
View file

@ -214,7 +214,7 @@ scm_c_vector_set_x (SCM v, size_t k, SCM obj)
if (k >= SCM_I_VECTOR_LENGTH (v)) if (k >= SCM_I_VECTOR_LENGTH (v))
scm_out_of_range (NULL, scm_from_size_t (k)); scm_out_of_range (NULL, scm_from_size_t (k));
SCM_SIMPLE_VECTOR_SET (v, k, obj); SCM_I_VECTOR_WELTS (v)[k] = obj;
} }
#undef FUNC_NAME #undef FUNC_NAME
@ -246,13 +246,13 @@ scm_c_make_vector (size_t k, SCM fill)
#define FUNC_NAME s_scm_make_vector #define FUNC_NAME s_scm_make_vector
{ {
SCM vector; SCM vector;
size_t j;
SCM_ASSERT_RANGE (1, scm_from_size_t (k), k <= VECTOR_MAX_LENGTH); SCM_ASSERT_RANGE (1, scm_from_size_t (k), k <= VECTOR_MAX_LENGTH);
vector = make_vector (k); vector = make_vector (k);
for (j = 0; j < k; ++j) SCM *slots = SCM_I_VECTOR_WELTS (vector);
SCM_SIMPLE_VECTOR_SET (vector, j, fill); for (size_t i = 0; i < k; ++i)
slots[i] = fill;
return vector; return vector;
} }