mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-02 13:00:26 +02:00
Code Activity

(scm_num2uint32): New function.

Browse source 
(scm_htonl, scm_ntohl): Use it to enforce 32-bit range check on
systems with 64-bit long.
This commit is contained in:
Kevin Ryde 2006-07-23 22:25:11 +00:00
parent 80f1ae3310
commit 0e558e5693
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libguile/socket.c
View file

@ -134,6 +134,17 @@ SCM_DEFINE (scm_ntohs, "ntohs", 1, 0, 0,
} }
#undef FUNC_NAME #undef FUNC_NAME
static uint32_t
scm_num2uint32 (SCM num, unsigned long int pos, const char *func)
{
unsigned long uu = scm_num2ulong (num, pos, func);
#if SIZEOF_LONG > 4
if (uu > 0xFFFFFFFFL)
scm_out_of_range (s_caller, num);
#endif
return (uint32_t) uu;
}
SCM_DEFINE (scm_htonl, "htonl", 1, 0, 0, SCM_DEFINE (scm_htonl, "htonl", 1, 0, 0,
(SCM value), (SCM value),
"Convert a 32 bit quantity from host to network byte ordering.\n" "Convert a 32 bit quantity from host to network byte ordering.\n"
@ -141,7 +152,7 @@ SCM_DEFINE (scm_htonl, "htonl", 1, 0, 0,
"and returned as a new integer.") "and returned as a new integer.")
#define FUNC_NAME s_scm_htonl #define FUNC_NAME s_scm_htonl
{ {
uint32_t c_in = SCM_NUM2ULONG (1, value); uint32_t c_in = scm_num2uint32 (value, SCM_ARG1, FUNC_NAME);
return scm_ulong2num (htonl (c_in)); return scm_ulong2num (htonl (c_in));
} }
@ -154,7 +165,7 @@ SCM_DEFINE (scm_ntohl, "ntohl", 1, 0, 0,
"and returned as a new integer.") "and returned as a new integer.")
#define FUNC_NAME s_scm_ntohl #define FUNC_NAME s_scm_ntohl
{ {
uint32_t c_in = SCM_NUM2ULONG (1, value); uint32_t c_in = scm_num2uint32 (value, SCM_ARG1, FUNC_NAME);
return scm_ulong2num (ntohl (c_in)); return scm_ulong2num (ntohl (c_in));
} }