From c3c259f0bef8cfd8d47606475348f088f7b0e120 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 28 Oct 2000 08:22:11 +0000 Subject: [PATCH] Update from libc. Adjust for portability: [HAVE_STDLIB_H]: Include stdlib.h. [HAVE_BP_SYM_H || _LIBC]: Guard inclusion of bp-sym.h. Undef __memchr, too. [!weak_alias]: Define __memchr to memchr. --- lib/memchr.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/lib/memchr.c b/lib/memchr.c index 8c3b59c1b..4b28e481f 100644 --- a/lib/memchr.c +++ b/lib/memchr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1991,93,96,97,99,2000 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); @@ -34,11 +34,18 @@ USA. */ # define __ptr_t char * #endif /* C++ or ANSI C. */ -#if defined (_LIBC) +#if defined _LIBC # include +# include +#else +# define reg_char char +#endif + +#if HAVE_STDLIB_H || defined _LIBC +# include #endif -#if defined (HAVE_LIMITS_H) || defined (_LIBC) +#if HAVE_LIMITS_H || defined _LIBC # include #endif @@ -49,21 +56,28 @@ USA. */ #endif #include +#if HAVE_BP_SYM_H || defined _LIBC +# include +#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) +__memchr (s, c_in, n) const __ptr_t s; - int c; + 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. */ @@ -197,3 +211,6 @@ memchr (s, c, n) return 0; } +#ifdef weak_alias +weak_alias (__memchr, BP_SYM (memchr)) +#endif -- 2.11.0