Mercurial > gnulib
changeset 419:3096e38ba55d
GNU text utilities
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Sun, 28 May 1995 01:47:31 +0000 |
| parents | fd9242b3b6f5 |
| children | 27af7c8f1b92 |
| files | lib/memchr.c lib/regex.c |
| diffstat | 2 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/memchr.c Wed May 24 05:15:28 1995 +0000 +++ b/lib/memchr.c Sun May 28 01:47:31 1995 +0000 @@ -33,6 +33,10 @@ # define __ptr_t char * #endif /* C++ or ANSI C. */ +#if defined (_LIBC) +# include <string.h> +#endif + #if defined (HAVE_LIMITS_H) || defined (_LIBC) # include <limits.h> #endif @@ -62,8 +66,9 @@ /* Handle the first few characters by reading one character at a time. Do this until CHAR_PTR is aligned on a longword boundary. */ - for (char_ptr = s; n > 0 && ((unsigned long int) char_ptr - & (sizeof (longword) - 1)) != 0; + for (char_ptr = (const unsigned char *) s; + n > 0 && ((unsigned long int) char_ptr + & (sizeof (longword) - 1)) != 0; --n, ++char_ptr) if (*char_ptr == c) return (__ptr_t) char_ptr; @@ -76,9 +81,9 @@ /* Bits 31, 24, 16, and 8 of this number are zero. Call these bits the "holes." Note that there is a hole just to the left of each byte, with an extra at the end: - + bits: 01111110 11111110 11111110 11111111 - bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD + bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD The 1-bits make sure that carries propagate to the next 0-bit. The 0-bits provide holes for carries to fall into. */ @@ -142,10 +147,10 @@ /* Add MAGIC_BITS to LONGWORD. */ if ((((longword + magic_bits) - + /* Set those bits that were unchanged by the addition. */ ^ ~longword) - + /* Look at only the hole bits. If any of the hole bits are unchanged, most likely one of the bytes was a zero. */