diff options
author | Andy Wingo <wingo@pobox.com> | 2015-01-22 13:24:30 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2015-01-22 13:24:30 +0100 |
commit | a5b5cb422e66f77cac34ded42631db6a067323cc (patch) | |
tree | f7bd502e20d0d3de3c4bb0fbaf588e1b3f04c42b /libguile | |
parent | a51111dd255189bd00eb28547491ee4a9bfa9ca1 (diff) | |
parent | 8cf2a7ba7432d68b9a055d29f18117be70375af9 (diff) | |
download | guile-a5b5cb422e66f77cac34ded42631db6a067323cc.tar.gz |
Merge commit '8cf2a7ba7432d68b9a055d29f18117be70375af9'
Diffstat (limited to 'libguile')
-rw-r--r-- | libguile/bytevectors.c | 7 | ||||
-rw-r--r-- | libguile/filesys.c | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c index 4f18be6ca..41d5b6c85 100644 --- a/libguile/bytevectors.c +++ b/libguile/bytevectors.c @@ -554,9 +554,14 @@ SCM_DEFINE (scm_bytevector_fill_x, "bytevector-fill!", 2, 0, 0, { size_t c_len, i; scm_t_uint8 *c_bv, c_fill; + int value; SCM_VALIDATE_BYTEVECTOR (1, bv); - c_fill = scm_to_int8 (fill); + + value = scm_to_int (fill); + if (SCM_UNLIKELY ((value < -128) || (value > 255))) + scm_out_of_range (FUNC_NAME, fill); + c_fill = (scm_t_uint8) value; c_len = SCM_BYTEVECTOR_LENGTH (bv); c_bv = (scm_t_uint8 *) SCM_BYTEVECTOR_CONTENTS (bv); diff --git a/libguile/filesys.c b/libguile/filesys.c index 204d74eed..95d1a9dff 100644 --- a/libguile/filesys.c +++ b/libguile/filesys.c @@ -774,8 +774,13 @@ SCM_DEFINE (scm_select, "select", 3, 2, 0, "This procedure has a variety of uses: waiting for the ability\n" "to provide input, accept output, or the existence of\n" "exceptional conditions on a collection of ports or file\n" - "descriptors, or waiting for a timeout to occur.\n" - "It also returns if interrupted by a signal.\n\n" + "descriptors, or waiting for a timeout to occur.\n\n" + + "When an error occurs, of if it is interrupted by a signal, this\n" + "procedure throws a @code{system-error} exception\n" + "(@pxref{Conventions, @code{system-error}}). In case of an\n" + "interruption, the associated error number is @var{EINTR}.\n\n" + "@var{reads}, @var{writes} and @var{excepts} can be lists or\n" "vectors, with each member a port or a file descriptor.\n" "The value returned is a list of three corresponding\n" |