projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dirname: move m4/dos.m4 functionality into lib/dosname.h
[gnulib.git]
/
lib
/
memchr2.c
diff --git
a/lib/memchr2.c
b/lib/memchr2.c
index
1eb8f9b
..
2e3c7cd
100644
(file)
--- a/
lib/memchr2.c
+++ b/
lib/memchr2.c
@@
-1,5
+1,5
@@
-/* Copyright (C) 1991, 1993, 1996
, 1997, 1999, 2000, 2003, 2004, 2006,
-
2008
Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1993, 1996
-1997, 1999-2000, 2003-2004, 2006, 2008-2011
+ Free Software Foundation, Inc.
Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
with help from Dan Sahlin (dan@sics.se) and
Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
with help from Dan Sahlin (dan@sics.se) and
@@
-29,8
+29,6
@@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <stdint.h>
#include <string.h>
#include <stdint.h>
#include <string.h>
-#include "intprops.h"
-
/* Return the first address of either C1 or C2 (treated as unsigned
char) that occurs within N bytes of the memory region S. If
neither byte appears, return NULL. */
/* Return the first address of either C1 or C2 (treated as unsigned
char) that occurs within N bytes of the memory region S. If
neither byte appears, return NULL. */
@@
-42,7
+40,7
@@
memchr2 (void const *s, int c1_in, int c2_in, size_t n)
performance. On 64-bit hardware, unsigned long is generally 64
bits already. Change this typedef to experiment with
performance. */
performance. On 64-bit hardware, unsigned long is generally 64
bits already. Change this typedef to experiment with
performance. */
- typedef unsigned long longword;
+ typedef unsigned long
int
longword;
const unsigned char *char_ptr;
const longword *longword_ptr;
const unsigned char *char_ptr;
const longword *longword_ptr;
@@
-80,22
+78,22
@@
memchr2 (void const *s, int c1_in, int c2_in, size_t n)
repeated_c2 = c2 | (c2 << 8);
repeated_c1 |= repeated_c1 << 16;
repeated_c2 |= repeated_c2 << 16;
repeated_c2 = c2 | (c2 << 8);
repeated_c1 |= repeated_c1 << 16;
repeated_c2 |= repeated_c2 << 16;
- if (0xffffffffU <
TYPE_MAXIMUM (longword)
)
+ if (0xffffffffU <
(longword) -1
)
{
repeated_one |= repeated_one << 31 << 1;
repeated_c1 |= repeated_c1 << 31 << 1;
repeated_c2 |= repeated_c2 << 31 << 1;
if (8 < sizeof (longword))
{
repeated_one |= repeated_one << 31 << 1;
repeated_c1 |= repeated_c1 << 31 << 1;
repeated_c2 |= repeated_c2 << 31 << 1;
if (8 < sizeof (longword))
- {
-
in
t i;
-
- for (i = 64; i < sizeof (longword) * 8; i *= 2)
- {
- repeated_one |= repeated_one << i;
- repeated_c1 |= repeated_c1 << i;
- repeated_c2 |= repeated_c2 << i;
- }
- }
+
{
+
size_
t i;
+
+
for (i = 64; i < sizeof (longword) * 8; i *= 2)
+
{
+
repeated_one |= repeated_one << i;
+
repeated_c1 |= repeated_c1 << i;
+
repeated_c2 |= repeated_c2 << i;
+
}
+
}
}
/* Instead of the traditional loop which tests each byte, we will test a
}
/* Instead of the traditional loop which tests each byte, we will test a
@@
-140,9
+138,9
@@
memchr2 (void const *s, int c1_in, int c2_in, size_t n)
longword longword2 = *longword_ptr ^ repeated_c2;
if (((((longword1 - repeated_one) & ~longword1)
longword longword2 = *longword_ptr ^ repeated_c2;
if (((((longword1 - repeated_one) & ~longword1)
- | ((longword2 - repeated_one) & ~longword2))
- & (repeated_one << 7)) != 0)
- break;
+
| ((longword2 - repeated_one) & ~longword2))
+
& (repeated_one << 7)) != 0)
+
break;
longword_ptr++;
n -= sizeof (longword);
}
longword_ptr++;
n -= sizeof (longword);
}
@@
-159,7
+157,7
@@
memchr2 (void const *s, int c1_in, int c2_in, size_t n)
for (; n > 0; --n, ++char_ptr)
{
if (*char_ptr == c1 || *char_ptr == c2)
for (; n > 0; --n, ++char_ptr)
{
if (*char_ptr == c1 || *char_ptr == c2)
- return (void *) char_ptr;
+
return (void *) char_ptr;
}
return NULL;
}
return NULL;