diff options
Diffstat (limited to 'libguile/net_db.c')
-rw-r--r-- | libguile/net_db.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libguile/net_db.c b/libguile/net_db.c index 8b2562d4a..cf353c82e 100644 --- a/libguile/net_db.c +++ b/libguile/net_db.c @@ -174,13 +174,13 @@ SCM_DEFINE (scm_gethost, "gethost", 0, 1, 0, if (!entry) scm_resolv_error (FUNC_NAME, host); - SCM_VECTOR_SET(result, 0, scm_from_locale_string (entry->h_name)); - SCM_VECTOR_SET(result, 1, scm_makfromstrs (-1, entry->h_aliases)); - SCM_VECTOR_SET(result, 2, scm_from_int (entry->h_addrtype)); - SCM_VECTOR_SET(result, 3, scm_from_int (entry->h_length)); + SCM_SIMPLE_VECTOR_SET(result, 0, scm_from_locale_string (entry->h_name)); + SCM_SIMPLE_VECTOR_SET(result, 1, scm_makfromstrs (-1, entry->h_aliases)); + SCM_SIMPLE_VECTOR_SET(result, 2, scm_from_int (entry->h_addrtype)); + SCM_SIMPLE_VECTOR_SET(result, 3, scm_from_int (entry->h_length)); if (sizeof (struct in_addr) != entry->h_length) { - SCM_VECTOR_SET(result, 4, SCM_BOOL_F); + SCM_SIMPLE_VECTOR_SET(result, 4, SCM_BOOL_F); return result; } for (argv = entry->h_addr_list; argv[i]; i++); @@ -189,7 +189,7 @@ SCM_DEFINE (scm_gethost, "gethost", 0, 1, 0, inad = *(struct in_addr *) argv[i]; lst = scm_cons (scm_from_ulong (ntohl (inad.s_addr)), lst); } - SCM_VECTOR_SET(result, 4, lst); + SCM_SIMPLE_VECTOR_SET(result, 4, lst); return result; } #undef FUNC_NAME @@ -248,10 +248,10 @@ SCM_DEFINE (scm_getnet, "getnet", 0, 1, 0, if (!entry) SCM_SYSERROR_MSG ("no such network ~A", scm_list_1 (net), eno); - SCM_VECTOR_SET(result, 0, scm_from_locale_string (entry->n_name)); - SCM_VECTOR_SET(result, 1, scm_makfromstrs (-1, entry->n_aliases)); - SCM_VECTOR_SET(result, 2, scm_from_int (entry->n_addrtype)); - SCM_VECTOR_SET(result, 3, scm_from_ulong (entry->n_net)); + SCM_SIMPLE_VECTOR_SET(result, 0, scm_from_locale_string (entry->n_name)); + SCM_SIMPLE_VECTOR_SET(result, 1, scm_makfromstrs (-1, entry->n_aliases)); + SCM_SIMPLE_VECTOR_SET(result, 2, scm_from_int (entry->n_addrtype)); + SCM_SIMPLE_VECTOR_SET(result, 3, scm_from_ulong (entry->n_net)); return result; } #undef FUNC_NAME @@ -300,9 +300,9 @@ SCM_DEFINE (scm_getproto, "getproto", 0, 1, 0, if (!entry) SCM_SYSERROR_MSG ("no such protocol ~A", scm_list_1 (protocol), eno); - SCM_VECTOR_SET(result, 0, scm_from_locale_string (entry->p_name)); - SCM_VECTOR_SET(result, 1, scm_makfromstrs (-1, entry->p_aliases)); - SCM_VECTOR_SET(result, 2, scm_from_int (entry->p_proto)); + SCM_SIMPLE_VECTOR_SET(result, 0, scm_from_locale_string (entry->p_name)); + SCM_SIMPLE_VECTOR_SET(result, 1, scm_makfromstrs (-1, entry->p_aliases)); + SCM_SIMPLE_VECTOR_SET(result, 2, scm_from_int (entry->p_proto)); return result; } #undef FUNC_NAME @@ -314,10 +314,10 @@ scm_return_entry (struct servent *entry) { SCM result = scm_c_make_vector (4, SCM_UNSPECIFIED); - SCM_VECTOR_SET(result, 0, scm_from_locale_string (entry->s_name)); - SCM_VECTOR_SET(result, 1, scm_makfromstrs (-1, entry->s_aliases)); - SCM_VECTOR_SET(result, 2, scm_from_uint16 (ntohs (entry->s_port))); - SCM_VECTOR_SET(result, 3, scm_from_locale_string (entry->s_proto)); + SCM_SIMPLE_VECTOR_SET(result, 0, scm_from_locale_string (entry->s_name)); + SCM_SIMPLE_VECTOR_SET(result, 1, scm_makfromstrs (-1, entry->s_aliases)); + SCM_SIMPLE_VECTOR_SET(result, 2, scm_from_uint16 (ntohs (entry->s_port))); + SCM_SIMPLE_VECTOR_SET(result, 3, scm_from_locale_string (entry->s_proto)); return result; } |