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

am 580a7073: Merge "Stop advertising rindex(3), which is both deprecated and unimplemented."

Browse Source 
* commit '580a707376d81bfcb39919f0a1203b39a39dbd8a':
  Stop advertising rindex(3), which is both deprecated and unimplemented.
This commit is contained in:
Elliott Hughes 2013-02-21 17:55:28 -08:00 committed by Android Git Automerger
commit 2a5b57db8c
4 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libc/arch-x86/string/rindex.S
View File

@ -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

3
libc/arch-x86/string/strrchr.S
View File

@ -1,3 +0,0 @@
/* $OpenBSD: strrchr.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
#define STRRCHR
#include "rindex.S"

1
libc/include/string.h
View File

@ -45,7 +45,6 @@ extern void* memmem(const void *, size_t, const void *, size_t) __purefunc;
extern void memswap(void *, void *, size_t); extern void memswap(void *, void *, size_t);
extern char* index(const char *, int) __purefunc; extern char* index(const char *, int) __purefunc;
extern char* rindex(const char *, int) __purefunc;
extern char* strchr(const char *, int) __purefunc; extern char* strchr(const char *, int) __purefunc;
extern char* strrchr(const char *, int) __purefunc; extern char* strrchr(const char *, int) __purefunc;

1
libc/include/strings.h
View File

@ -47,7 +47,6 @@ void bcopy(const void *, void *, size_t);
void bzero(void *, size_t); void bzero(void *, size_t);
int ffs(int); int ffs(int);
char *index(const char *, int); char *index(const char *, int);
char *rindex(const char *, int);
int strcasecmp(const char *, const char *); int strcasecmp(const char *, const char *);
int strncasecmp(const char *, const char *, size_t); int strncasecmp(const char *, const char *, size_t);