lib/string.c: remove strnicmp()

Now that all in-tree users of strnicmp have been converted to strncasecmp, the wrapper can be removed.

Rasmus Villemoes committed 11 years ago

Commit af3cd131 parent 9814ec14 files · +0 −13Browse files

Unified · Split

4 files

arch/frv/include/asm/string.h +0 −1
arch/s390/include/asm/string.h +0 −1
include/linux/string.h +0 −3
lib/string.c +0 −8

arch/frv/include/asm/string.h+0−1

@@ -33,7 +33,6 @@ extern void memcpy(void , const void *, __kernel_size_t); · 32 unmodified lines
33	33	#define __HAVE_ARCH_STRNCAT 1
34	34	#define __HAVE_ARCH_STRCMP 1
35	35	#define __HAVE_ARCH_STRNCMP 1
36		−#define __HAVE_ARCH_STRNICMP 1
37	36	#define __HAVE_ARCH_STRCHR 1
38	37	#define __HAVE_ARCH_STRRCHR 1
39	38	#define __HAVE_ARCH_STRSTR 1

arch/s390/include/asm/string.h+0−1

@@ -44,7 +44,6 @@ extern char strstr(const char , const char *); · 43 unmodified lines
44	44	#undef __HAVE_ARCH_STRCHR
45	45	#undef __HAVE_ARCH_STRNCHR
46	46	#undef __HAVE_ARCH_STRNCMP
47		−#undef __HAVE_ARCH_STRNICMP
48	47	#undef __HAVE_ARCH_STRPBRK
49	48	#undef __HAVE_ARCH_STRSEP
50	49	#undef __HAVE_ARCH_STRSPN

include/linux/string.h+0−3

@@ -40,9 +40,6 @@ extern int strcmp(const char ,const char ); · 39 unmodified lines
40	40	#ifndef __HAVE_ARCH_STRNCMP
41	41	extern int strncmp(const char ,const char ,__kernel_size_t);
42	42	#endif
43		−#ifndef __HAVE_ARCH_STRNICMP
44		−#define strnicmp strncasecmp
45		−#endif
46	43	#ifndef __HAVE_ARCH_STRCASECMP
47	44	extern int strcasecmp(const char s1, const char s2);
48	45	#endif

lib/string.c+0−8

@@ -58,14 +58,6 @@ int strncasecmp(const char s1, const char s2, size_t len) · 57 unmodified lines
58	58	}
59	59	EXPORT_SYMBOL(strncasecmp);
60	60	#endif
61		−#ifndef __HAVE_ARCH_STRNICMP
62		−#undef strnicmp
63		−int strnicmp(const char s1, const char s2, size_t len)
64		−{
65		− return strncasecmp(s1, s2, len);
66		−}
67		−EXPORT_SYMBOL(strnicmp);
68		−#endif
69	61
70	62	#ifndef __HAVE_ARCH_STRCASECMP
71	63	int strcasecmp(const char s1, const char s2)