diff options
| author | Elliott Hughes <enh@google.com> | 2013-02-21 18:01:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-21 18:01:17 -0800 |
| commit | 7dfc6a3cd178281c1005a94e84ce5359b23e612f (patch) | |
| tree | 66d06515b780783a7862bbad56438844d28523e7 /libc | |
| parent | d470955eb59b09274e8040ff43b1e907da917d91 (diff) | |
| parent | e974e951606d2efbad4bafe5edbd09c13d875f6a (diff) | |
| download | android_bionic-7dfc6a3cd178281c1005a94e84ce5359b23e612f.tar.gz android_bionic-7dfc6a3cd178281c1005a94e84ce5359b23e612f.tar.bz2 android_bionic-7dfc6a3cd178281c1005a94e84ce5359b23e612f.zip | |
am e974e951: am 2a5b57db: am 580a7073: Merge "Stop advertising rindex(3), which is both deprecated and unimplemented."
* commit 'e974e951606d2efbad4bafe5edbd09c13d875f6a':
Stop advertising rindex(3), which is both deprecated and unimplemented.
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/arch-x86/string/rindex.S | 29 | ||||
| -rw-r--r-- | libc/arch-x86/string/strrchr.S | 3 | ||||
| -rw-r--r-- | libc/include/string.h | 1 | ||||
| -rw-r--r-- | libc/include/strings.h | 1 |
4 files changed, 0 insertions, 34 deletions
diff --git a/libc/arch-x86/string/rindex.S b/libc/arch-x86/string/rindex.S deleted file mode 100644 index 0260d384c..000000000 --- a/libc/arch-x86/string/rindex.S +++ /dev/null @@ -1,29 +0,0 @@ -/* $OpenBSD: rindex.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ -/* - * Written by J.T. Conklin <jtc@netbsd.org>. - * Public domain. - */ - -#include <machine/asm.h> - -#ifdef STRRCHR -ENTRY(strrchr) -#else -ENTRY(rindex) -#endif - pushl %ebx - movl 8(%esp),%edx - movb 12(%esp),%cl - xorl %eax,%eax /* init pointer to null */ - .align 2,0x90 -L1: - movb (%edx),%bl - cmpb %bl,%cl - jne L2 - movl %edx,%eax -L2: - incl %edx - testb %bl,%bl /* null terminator??? */ - jnz L1 - popl %ebx - ret diff --git a/libc/arch-x86/string/strrchr.S b/libc/arch-x86/string/strrchr.S deleted file mode 100644 index 4ee153ff5..000000000 --- a/libc/arch-x86/string/strrchr.S +++ /dev/null @@ -1,3 +0,0 @@ -/* $OpenBSD: strrchr.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ -#define STRRCHR -#include "rindex.S" diff --git a/libc/include/string.h b/libc/include/string.h index 70e004204..63e768eb7 100644 --- a/libc/include/string.h +++ b/libc/include/string.h @@ -45,7 +45,6 @@ extern void* memmem(const void *, size_t, const void *, size_t) __purefunc; extern void memswap(void *, void *, size_t); extern char* index(const char *, int) __purefunc; -extern char* rindex(const char *, int) __purefunc; extern char* strchr(const char *, int) __purefunc; extern char* strrchr(const char *, int) __purefunc; diff --git a/libc/include/strings.h b/libc/include/strings.h index fbdcefc38..0ee691dec 100644 --- a/libc/include/strings.h +++ b/libc/include/strings.h @@ -47,7 +47,6 @@ void bcopy(const void *, void *, size_t); void bzero(void *, size_t); int ffs(int); char *index(const char *, int); -char *rindex(const char *, int); int strcasecmp(const char *, const char *); int strncasecmp(const char *, const char *, size_t); |