summaryrefslogtreecommitdiff
path: root/lib/memchr2.c
diff options
context:
space:
mode:
authorEric Blake <ebb9@byu.net>2008-03-01 08:40:22 -0700
committerEric Blake <ebb9@byu.net>2008-03-01 08:56:07 -0700
commit03e8239058dbd9f86512123413cf8600ca31200c (patch)
treea6d599235b662516540c2bd6aec9553c8d313da5 /lib/memchr2.c
parent12ffac08b6f32ff566f160c27a05dddd5f3b8dc6 (diff)
downloadgnulib-03e8239058dbd9f86512123413cf8600ca31200c.tar.gz
Fix bugs in last patch.
* lib/memchr2.c (memchr2): Fix typo. * tests/test-memchr2.c: Test previous bug, and don't use GNU extension. Reported by Bruce Korb. Signed-off-by: Eric Blake <ebb9@byu.net>
Diffstat (limited to 'lib/memchr2.c')
-rw-r--r--lib/memchr2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/memchr2.c b/lib/memchr2.c
index 540ed9fc3b..d5b0a787a8 100644
--- a/lib/memchr2.c
+++ b/lib/memchr2.c
@@ -81,8 +81,8 @@ memchr2 (void const *s, int c1_in, int c2_in, size_t n)
magic_bits = 0xfefefefe;
charmask1 = c1 | (c1 << 8);
charmask2 = c2 | (c2 << 8);
- charmask1 |= charmask2 << 16;
- charmask1 |= charmask2 << 16;
+ charmask1 |= charmask1 << 16;
+ charmask2 |= charmask2 << 16;
#if 0xffffffffU < UINTMAX_MAX
magic_bits |= magic_bits << 32;
charmask1 |= charmask1 << 32;