mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-07-02 07:40:30 +02:00
Switch all users of SCM_SIMPLE_VECTOR_REF to scm_c_vector_ref
* libguile/arrays.c: * libguile/eval.c: * libguile/filesys.c: * libguile/hashtab.c: * libguile/intrinsics.c: * libguile/memoize.c: * libguile/modules.c: * libguile/poll.c: * libguile/ports-internal.h: * libguile/posix.c: * libguile/print.c: * libguile/scmsigs.c: * libguile/socket.c: * libguile/stime.c: * libguile/strports.c: * libguile/vectors.c: Use C function instead of macro.
This commit is contained in:
parent
d73c675fa6
commit
4dedc48cfb
16 changed files with 66 additions and 66 deletions
|
@ -1121,7 +1121,7 @@ scm_to_sockaddr (SCM address, size_t *address_size)
|
|||
SCM_VALIDATE_VECTOR (1, address);
|
||||
|
||||
*address_size = 0;
|
||||
family = scm_to_short (SCM_SIMPLE_VECTOR_REF (address, 0));
|
||||
family = scm_to_short (scm_c_vector_ref (address, 0));
|
||||
|
||||
switch (family)
|
||||
{
|
||||
|
@ -1142,9 +1142,9 @@ scm_to_sockaddr (SCM address, size_t *address_size)
|
|||
#endif
|
||||
|
||||
c_inet.sin_addr.s_addr =
|
||||
htonl (scm_to_ulong (SCM_SIMPLE_VECTOR_REF (address, 1)));
|
||||
htonl (scm_to_ulong (scm_c_vector_ref (address, 1)));
|
||||
c_inet.sin_port =
|
||||
htons (scm_to_ushort (SCM_SIMPLE_VECTOR_REF (address, 2)));
|
||||
htons (scm_to_ushort (scm_c_vector_ref (address, 2)));
|
||||
c_inet.sin_family = AF_INET;
|
||||
|
||||
*address_size = sizeof (c_inet);
|
||||
|
@ -1166,14 +1166,14 @@ scm_to_sockaddr (SCM address, size_t *address_size)
|
|||
struct sockaddr_in6 c_inet6;
|
||||
|
||||
scm_to_ipv6 (c_inet6.sin6_addr.s6_addr,
|
||||
SCM_SIMPLE_VECTOR_REF (address, 1));
|
||||
scm_c_vector_ref (address, 1));
|
||||
c_inet6.sin6_port =
|
||||
htons (scm_to_ushort (SCM_SIMPLE_VECTOR_REF (address, 2)));
|
||||
htons (scm_to_ushort (scm_c_vector_ref (address, 2)));
|
||||
c_inet6.sin6_flowinfo =
|
||||
scm_to_uint32 (SCM_SIMPLE_VECTOR_REF (address, 3));
|
||||
scm_to_uint32 (scm_c_vector_ref (address, 3));
|
||||
#ifdef HAVE_SIN6_SCOPE_ID
|
||||
c_inet6.sin6_scope_id =
|
||||
scm_to_ulong (SCM_SIMPLE_VECTOR_REF (address, 4));
|
||||
scm_to_ulong (scm_c_vector_ref (address, 4));
|
||||
#endif
|
||||
|
||||
c_inet6.sin6_family = AF_INET6;
|
||||
|
@ -1198,7 +1198,7 @@ scm_to_sockaddr (SCM address, size_t *address_size)
|
|||
SCM path;
|
||||
size_t path_len = 0;
|
||||
|
||||
path = SCM_SIMPLE_VECTOR_REF (address, 1);
|
||||
path = scm_c_vector_ref (address, 1);
|
||||
if (!scm_is_string (path) && !scm_is_false (path))
|
||||
scm_misc_error (FUNC_NAME, "invalid unix address "
|
||||
"path: ~A", scm_list_1 (path));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue