diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-06-14 09:25:22 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-06-14 09:25:22 +0000 |
| commit | 28e351249e754446ab86c9cdc5bdbe2747cff998 (patch) | |
| tree | b222260b53c9d5e477f5cec36319fb36ebabb3bb /sysdeps/generic/memchr.c | |
| parent | 6d525e7a639fa681d82892628b3c6fa1acbf8c93 (diff) | |
| download | glibc-28e351249e754446ab86c9cdc5bdbe2747cff998.zip glibc-28e351249e754446ab86c9cdc5bdbe2747cff998.tar.gz glibc-28e351249e754446ab86c9cdc5bdbe2747cff998.tar.bz2 | |
Update.
* sysdeps/generic/strchr.c: Include <memcopy.h> and use reg_char
for character to search, to help the compiler.
* sysdeps/generic/strchrnul.c: Likewise.
* sysdeps/generic/memchr.c: Likewise.
* sysdeps/generic/memccpy.c: Likewise.
* sysdeps/generic/rawmemchr.c: Likewise. Fix comment.
1999-06-13 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
Diffstat (limited to 'sysdeps/generic/memchr.c')
| -rw-r--r-- | sysdeps/generic/memchr.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sysdeps/generic/memchr.c b/sysdeps/generic/memchr.c index c8926c7..9ea9ce2 100644 --- a/sysdeps/generic/memchr.c +++ b/sysdeps/generic/memchr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1993, 1996, 1997, 1999 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); @@ -33,6 +33,9 @@ #if defined (_LIBC) # include <string.h> +# include <memcopy.h> +#else +# define reg_char char #endif #if defined (HAVE_LIMITS_H) || defined (_LIBC) @@ -52,16 +55,17 @@ /* 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. */ |