From 167d5e33fcb821e51e2f9dcf460591737c3c7972 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Tue, 3 Jan 2006 14:50:18 +0000 Subject: Complete split of all the string functions. Hope haven't broken too much. wcscoll/strcoll needs some love ... --- libc/string/memchr.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) (limited to 'libc/string/memchr.c') diff --git a/libc/string/memchr.c b/libc/string/memchr.c index d0aa004d7..288bd9748 100644 --- a/libc/string/memchr.c +++ b/libc/string/memchr.c @@ -1,14 +1,40 @@ /* + * Copyright (C) 2002 Manuel Novoa III * Copyright (C) 2000-2005 Erik Andersen * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ -#define L_memchr -#define Wmemchr __memchr +#include "_string.h" -#include "wstring.c" +#ifdef WANT_WIDE +# define __Wmemchr __wmemchr +# define Wmemchr wmemchr +#else +# define __Wmemchr __memchr +# define Wmemchr memchr +#endif -strong_alias(__memchr, memchr) +Wvoid attribute_hidden *__Wmemchr(const Wvoid *s, Wint c, size_t n) +{ + register const Wuchar *r = (const Wuchar *) s; +#ifdef __BCC__ + /* bcc can optimize the counter if it thinks it is a pointer... */ + register const char *np = (const char *) n; +#else +# define np n +#endif -#undef L_memchr + while (np) { + if (*r == ((Wuchar)c)) { + return (Wvoid *) r; /* silence the warning */ + } + ++r; + --np; + } + + return NULL; +} +#undef np + +strong_alias(__Wmemchr,Wmemchr) -- cgit v1.2.3