diff options
| author | Andy Wingo <wingo@pobox.com> | 2011-11-11 16:27:30 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2011-11-11 16:27:30 +0100 |
| commit | 16371014d6231394dbfc9c5cc9dfcceabd8bc234 (patch) | |
| tree | 563fbb1c6f73ea76226122043b712ed6645b5908 /libguile/bitvectors.c | |
| parent | b86b70feced7d2be203be0738e1bab8d1e81a11e (diff) | |
| parent | 39c5363b4fbd32f1c895e8fa8b0c8dd067907947 (diff) | |
| download | guile-16371014d6231394dbfc9c5cc9dfcceabd8bc234.tar.gz | |
Merge remote-tracking branch 'origin/stable-2.0'
Diffstat (limited to 'libguile/bitvectors.c')
| -rw-r--r-- | libguile/bitvectors.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/bitvectors.c b/libguile/bitvectors.c index 12dd13637..5b5a1b8e2 100644 --- a/libguile/bitvectors.c +++ b/libguile/bitvectors.c @@ -568,7 +568,7 @@ SCM_DEFINE (scm_bit_set_star_x, "bit-set*!", 3, 0, 0, "\n" "If @var{kv} is a bit vector, then those entries where it has\n" "@code{#t} are the ones in @var{v} which are set to @var{obj}.\n" - "@var{kv} and @var{v} must be the same length. When @var{obj}\n" + "@var{v} must be at least as long as @var{kv}. When @var{obj}\n" "is @code{#t} it's like @var{kv} is OR'ed into @var{v}. Or when\n" "@var{obj} is @code{#f} it can be seen as an ANDNOT.\n" "\n" @@ -611,10 +611,10 @@ SCM_DEFINE (scm_bit_set_star_x, "bit-set*!", 3, 0, 0, ssize_t kv_inc; const scm_t_uint32 *kv_bits; - kv_bits = scm_bitvector_elements (v, &kv_handle, + kv_bits = scm_bitvector_elements (kv, &kv_handle, &kv_off, &kv_len, &kv_inc); - if (v_len != kv_len) + if (v_len < kv_len) scm_misc_error (NULL, "bit vectors must have equal length", SCM_EOL); |