generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 1e96d49a: am afa31042: Merge "Fix strchr for basic non-sse case on x86"

Browse Source 
* commit '1e96d49a7d4d1af8f3bd6630e4ec9369813f18e7':
  Fix strchr for basic non-sse case on x86
This commit is contained in:
Elliott Hughes 2013-09-03 14:07:11 -07:00 committed by Android Git Automerger
commit eb31e1c558
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/arch-x86/x86.mk
View File

@ -72,7 +72,7 @@ _LIBC_ARCH_COMMON_SRC_FILES += \
arch-x86/string/bzero.S \ arch-x86/string/bzero.S \
bionic/memrchr.c \ bionic/memrchr.c \
bionic/memchr.c \ bionic/memchr.c \
string/strchr.cpp \ bionic/strchr.cpp \
string/strrchr.c \ string/strrchr.c \
string/index.c \ string/index.c \
bionic/strnlen.c \ bionic/strnlen.c \

4
libc/include/string.h
View File

@ -46,6 +46,8 @@ extern void memswap(void *, void *, size_t);
extern char* index(const char *, int) __purefunc; extern char* index(const char *, int) __purefunc;
extern char* strchr(const char *, int) __purefunc; extern char* strchr(const char *, int) __purefunc;
extern char* __strchr_chk(const char *, int, size_t);
extern char* strrchr(const char *, int) __purefunc; extern char* strrchr(const char *, int) __purefunc;
extern size_t strlen(const char *) __purefunc; extern size_t strlen(const char *) __purefunc;
@ -238,8 +240,6 @@ size_t strlen(const char *s) {
return __strlen_chk(s, bos); return __strlen_chk(s, bos);
} }
extern char* __strchr_chk(const char *, int, size_t);
__BIONIC_FORTIFY_INLINE __BIONIC_FORTIFY_INLINE
char* strchr(const char *s, int c) { char* strchr(const char *s, int c) {
size_t bos = __bos(s); size_t bos = __bos(s);