Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af3cd135 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Linus Torvalds
Browse files

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: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: David Howells <dhowells@redhat.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9814ec13

arch/frv/include/asm/string.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -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

arch/s390/include/asm/string.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -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

include/linux/string.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -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

lib/string.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -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)