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

Switch all users of SCM_SIMPLE_VECTOR_SET to scm_c_vector_set_x

Browse source 
* libguile/eval.c:
* libguile/filesys.c:
* libguile/hashtab.c:
* libguile/memoize.c:
* libguile/net_db.c:
* libguile/ports-internal.h:
* libguile/ports.c:
* libguile/posix.c:
* libguile/print.c:
* libguile/regex-posix.c:
* libguile/scmsigs.c:
* libguile/socket.c:
* libguile/stime.c:
* libguile/strports.c: Use C function instead of macro.
This commit is contained in:
Andy Wingo 2025-06-24 10:40:40 +02:00
parent 4dedc48cfb
commit 617344f822
14 changed files with 153 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

33
libguile/socket.c
View file

@ -1040,12 +1040,11 @@ _scm_from_sockaddr (const scm_t_max_sockaddr *address, unsigned addr_size,
result = scm_c_make_vector (3, SCM_UNSPECIFIED);
SCM_SIMPLE_VECTOR_SET(result, 0,
scm_from_short (fam));
SCM_SIMPLE_VECTOR_SET(result, 1,
scm_from_ulong (ntohl (nad->sin_addr.s_addr)));
SCM_SIMPLE_VECTOR_SET(result, 2,
scm_from_ushort (ntohs (nad->sin_port)));
scm_c_vector_set_x (result, 0, scm_from_short (fam));
scm_c_vector_set_x (result, 1,
scm_from_ulong (ntohl (nad->sin_addr.s_addr)));
scm_c_vector_set_x (result, 2,
scm_from_ushort (ntohs (nad->sin_port)));
}
break;
#ifdef HAVE_IPV6
@ -1054,14 +1053,14 @@ _scm_from_sockaddr (const scm_t_max_sockaddr *address, unsigned addr_size,
const struct sockaddr_in6 *nad = (struct sockaddr_in6 *) address;
result = scm_c_make_vector (5, SCM_UNSPECIFIED);
SCM_SIMPLE_VECTOR_SET(result, 0, scm_from_short (fam));
SCM_SIMPLE_VECTOR_SET(result, 1, scm_from_ipv6 (nad->sin6_addr.s6_addr));
SCM_SIMPLE_VECTOR_SET(result, 2, scm_from_ushort (ntohs (nad->sin6_port)));
SCM_SIMPLE_VECTOR_SET(result, 3, scm_from_uint32 (nad->sin6_flowinfo));
scm_c_vector_set_x (result, 0, scm_from_short (fam));
scm_c_vector_set_x (result, 1, scm_from_ipv6 (nad->sin6_addr.s6_addr));
scm_c_vector_set_x (result, 2, scm_from_ushort (ntohs (nad->sin6_port)));
scm_c_vector_set_x (result, 3, scm_from_uint32 (nad->sin6_flowinfo));
#ifdef HAVE_SIN6_SCOPE_ID
SCM_SIMPLE_VECTOR_SET(result, 4, scm_from_ulong (nad->sin6_scope_id));
scm_c_vector_set_x (result, 4, scm_from_ulong (nad->sin6_scope_id));
#else
SCM_SIMPLE_VECTOR_SET(result, 4, SCM_INUM0);
scm_c_vector_set_x (result, 4, SCM_INUM0);
#endif
}
break;
@ -1073,17 +1072,17 @@ _scm_from_sockaddr (const scm_t_max_sockaddr *address, unsigned addr_size,
result = scm_c_make_vector (2, SCM_UNSPECIFIED);
SCM_SIMPLE_VECTOR_SET(result, 0, scm_from_short (fam));
scm_c_vector_set_x (result, 0, scm_from_short (fam));
/* When addr_size is not enough to cover sun_path, do not try
to access it. */
if (addr_size <= offsetof (struct sockaddr_un, sun_path))
SCM_SIMPLE_VECTOR_SET(result, 1, SCM_BOOL_F);
scm_c_vector_set_x (result, 1, SCM_BOOL_F);
else
{
size_t path_size = addr_size - offsetof (struct sockaddr_un, sun_path);
SCM_SIMPLE_VECTOR_SET (result, 1,
scm_from_locale_stringn (nad->sun_path,
path_size));
scm_c_vector_set_x (result, 1,
scm_from_locale_stringn (nad->sun_path,
path_size));
}
}
break;