提交 af3cd135 编写于 作者: R Rasmus Villemoes 提交者: Linus Torvalds

lib/string.c: remove strnicmp()

Now that all in-tree users of strnicmp have been converted to
strncasecmp, the wrapper can be removed.
Signed-off-by: NRasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: David Howells <dhowells@redhat.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 9814ec13
...@@ -33,7 +33,6 @@ extern void *memcpy(void *, const void *, __kernel_size_t); ...@@ -33,7 +33,6 @@ extern void *memcpy(void *, const void *, __kernel_size_t);
#define __HAVE_ARCH_STRNCAT 1 #define __HAVE_ARCH_STRNCAT 1
#define __HAVE_ARCH_STRCMP 1 #define __HAVE_ARCH_STRCMP 1
#define __HAVE_ARCH_STRNCMP 1 #define __HAVE_ARCH_STRNCMP 1
#define __HAVE_ARCH_STRNICMP 1
#define __HAVE_ARCH_STRCHR 1 #define __HAVE_ARCH_STRCHR 1
#define __HAVE_ARCH_STRRCHR 1 #define __HAVE_ARCH_STRRCHR 1
#define __HAVE_ARCH_STRSTR 1 #define __HAVE_ARCH_STRSTR 1
......
...@@ -44,7 +44,6 @@ extern char *strstr(const char *, const char *); ...@@ -44,7 +44,6 @@ extern char *strstr(const char *, const char *);
#undef __HAVE_ARCH_STRCHR #undef __HAVE_ARCH_STRCHR
#undef __HAVE_ARCH_STRNCHR #undef __HAVE_ARCH_STRNCHR
#undef __HAVE_ARCH_STRNCMP #undef __HAVE_ARCH_STRNCMP
#undef __HAVE_ARCH_STRNICMP
#undef __HAVE_ARCH_STRPBRK #undef __HAVE_ARCH_STRPBRK
#undef __HAVE_ARCH_STRSEP #undef __HAVE_ARCH_STRSEP
#undef __HAVE_ARCH_STRSPN #undef __HAVE_ARCH_STRSPN
......
...@@ -40,9 +40,6 @@ extern int strcmp(const char *,const char *); ...@@ -40,9 +40,6 @@ extern int strcmp(const char *,const char *);
#ifndef __HAVE_ARCH_STRNCMP #ifndef __HAVE_ARCH_STRNCMP
extern int strncmp(const char *,const char *,__kernel_size_t); extern int strncmp(const char *,const char *,__kernel_size_t);
#endif #endif
#ifndef __HAVE_ARCH_STRNICMP
#define strnicmp strncasecmp
#endif
#ifndef __HAVE_ARCH_STRCASECMP #ifndef __HAVE_ARCH_STRCASECMP
extern int strcasecmp(const char *s1, const char *s2); extern int strcasecmp(const char *s1, const char *s2);
#endif #endif
......
...@@ -58,14 +58,6 @@ int strncasecmp(const char *s1, const char *s2, size_t len) ...@@ -58,14 +58,6 @@ int strncasecmp(const char *s1, const char *s2, size_t len)
} }
EXPORT_SYMBOL(strncasecmp); EXPORT_SYMBOL(strncasecmp);
#endif #endif
#ifndef __HAVE_ARCH_STRNICMP
#undef strnicmp
int strnicmp(const char *s1, const char *s2, size_t len)
{
return strncasecmp(s1, s2, len);
}
EXPORT_SYMBOL(strnicmp);
#endif
#ifndef __HAVE_ARCH_STRCASECMP #ifndef __HAVE_ARCH_STRCASECMP
int strcasecmp(const char *s1, const char *s2) int strcasecmp(const char *s1, const char *s2)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册