-/* Copyright (C) 1991, 1993 Free Software Foundation, Inc.
- Based on strlen implemention by Torbjorn Granlund (tege@sics.se),
+/* Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003 Free
+ Software Foundation, Inc.
+
+ Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
with help from Dan Sahlin (dan@sics.se) and
commentary by Jim Blandy (jimb@ai.mit.edu);
adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu),
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA. */
#ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
#endif
-#undef __ptr_t
-#if defined (__cplusplus) || (defined (__STDC__) && __STDC__)
-# define __ptr_t void *
-#else /* Not C++ or ANSI C. */
-# define __ptr_t char *
-#endif /* C++ or ANSI C. */
+#include <string.h>
-#if defined (_LIBC)
-# include <string.h>
+#if defined _LIBC
+# include <memcopy.h>
+#else
+# define reg_char char
#endif
-#if defined (HAVE_LIMITS_H) || defined (_LIBC)
-# include <limits.h>
-#endif
+#include <limits.h>
+#include <stdlib.h>
#define LONG_MAX_32_BITS 2147483647
-#ifndef LONG_MAX
-#define LONG_MAX LONG_MAX_32_BITS
-#endif
-
#include <sys/types.h>
+#if HAVE_BP_SYM_H || defined _LIBC
+# include <bp-sym.h>
+#else
+# define BP_SYM(sym) sym
+#endif
+#undef memchr
+#undef __memchr
/* Search no more than N bytes of S for C. */
-
-__ptr_t
-memchr (s, c, n)
- const __ptr_t s;
- int c;
- size_t n;
+void *
+__memchr (void const *s, int c_in, size_t n)
{
const unsigned char *char_ptr;
const unsigned long int *longword_ptr;
unsigned long int longword, magic_bits, charmask;
+ unsigned reg_char c;
- c = (unsigned char) c;
+ c = (unsigned char) c_in;
/* Handle the first few characters by reading one character at a time.
Do this until CHAR_PTR is aligned on a longword boundary. */
& (sizeof (longword) - 1)) != 0;
--n, ++char_ptr)
if (*char_ptr == c)
- return (__ptr_t) char_ptr;
+ return (void *) char_ptr;
/* All these elucidatory comments refer to 4-byte longwords,
but the theory applies equally well to 8-byte longwords. */
const unsigned char *cp = (const unsigned char *) (longword_ptr - 1);
if (cp[0] == c)
- return (__ptr_t) cp;
+ return (void *) cp;
if (cp[1] == c)
- return (__ptr_t) &cp[1];
+ return (void *) &cp[1];
if (cp[2] == c)
- return (__ptr_t) &cp[2];
+ return (void *) &cp[2];
if (cp[3] == c)
- return (__ptr_t) &cp[3];
+ return (void *) &cp[3];
#if LONG_MAX > 2147483647
if (cp[4] == c)
- return (__ptr_t) &cp[4];
+ return (void *) &cp[4];
if (cp[5] == c)
- return (__ptr_t) &cp[5];
+ return (void *) &cp[5];
if (cp[6] == c)
- return (__ptr_t) &cp[6];
+ return (void *) &cp[6];
if (cp[7] == c)
- return (__ptr_t) &cp[7];
+ return (void *) &cp[7];
#endif
}
while (n-- > 0)
{
if (*char_ptr == c)
- return (__ptr_t) char_ptr;
+ return (void *) char_ptr;
else
++char_ptr;
}
return 0;
}
+#ifdef weak_alias
+weak_alias (__memchr, BP_SYM (memchr))
+#endif