History

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
  1. arch/frv/include/asm/string.h +0 −1
  2. arch/s390/include/asm/string.h +0 −1
  3. include/linux/string.h +0 −3
  4. 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#define __HAVE_ARCH_STRNCAT 133#define __HAVE_ARCH_STRNCAT 1
34#define __HAVE_ARCH_STRCMP 134#define __HAVE_ARCH_STRCMP 1
35#define __HAVE_ARCH_STRNCMP 135#define __HAVE_ARCH_STRNCMP 1
36#define __HAVE_ARCH_STRNICMP 1
37#define __HAVE_ARCH_STRCHR 136#define __HAVE_ARCH_STRCHR 1
38#define __HAVE_ARCH_STRRCHR 137#define __HAVE_ARCH_STRRCHR 1
39#define __HAVE_ARCH_STRSTR 138#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#undef __HAVE_ARCH_STRCHR44#undef __HAVE_ARCH_STRCHR
45#undef __HAVE_ARCH_STRNCHR45#undef __HAVE_ARCH_STRNCHR
46#undef __HAVE_ARCH_STRNCMP46#undef __HAVE_ARCH_STRNCMP
47#undef __HAVE_ARCH_STRNICMP
48#undef __HAVE_ARCH_STRPBRK47#undef __HAVE_ARCH_STRPBRK
49#undef __HAVE_ARCH_STRSEP48#undef __HAVE_ARCH_STRSEP
50#undef __HAVE_ARCH_STRSPN49#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#ifndef __HAVE_ARCH_STRNCMP40#ifndef __HAVE_ARCH_STRNCMP
41extern int strncmp(const char *,const char *,__kernel_size_t);41extern int strncmp(const char *,const char *,__kernel_size_t);
42#endif42#endif
43#ifndef __HAVE_ARCH_STRNICMP
44#define strnicmp strncasecmp
45#endif
46#ifndef __HAVE_ARCH_STRCASECMP43#ifndef __HAVE_ARCH_STRCASECMP
47extern int strcasecmp(const char *s1, const char *s2);44extern int strcasecmp(const char *s1, const char *s2);
48#endif45#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}
59EXPORT_SYMBOL(strncasecmp);59EXPORT_SYMBOL(strncasecmp);
60#endif60#endif
61#ifndef __HAVE_ARCH_STRNICMP
62#undef strnicmp
63int strnicmp(const char *s1, const char *s2, size_t len)
64{
65 return strncasecmp(s1, s2, len);
66}
67EXPORT_SYMBOL(strnicmp);
68#endif
69 61
70#ifndef __HAVE_ARCH_STRCASECMP62#ifndef __HAVE_ARCH_STRCASECMP
71int strcasecmp(const char *s1, const char *s2)63int strcasecmp(const char *s1, const char *s2)