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

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

lib: string: Make all calls to strnicmp into calls to strncasecmp 



The previous patch made strnicmp into a wrapper for strncasecmp.

This patch makes all in-tree users of strnicmp call strncasecmp
directly, while still making sure that the strnicmp symbol can be used
by out-of-tree modules.  It should be considered a temporary hack until
all in-tree callers have been converted.

Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cd514e72

include/linux/string.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ extern int strcmp(const char *,const char *); 
extern int strncmp(const char *,const char *,__kernel_size_t);

#endif

#ifndef __HAVE_ARCH_STRNICMP

extern int strnicmp(const char *, const char *, __kernel_size_t);

#define strnicmp strncasecmp

#endif

#ifndef __HAVE_ARCH_STRCASECMP

extern int strcasecmp(const char *s1, const char *s2);

lib/string.c

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ int strncasecmp(const char *s1, const char *s2, size_t len) 
EXPORT_SYMBOL(strncasecmp);

#endif

#ifndef __HAVE_ARCH_STRNICMP

#undef strnicmp

int strnicmp(const char *s1, const char *s2, size_t len)

{

	return strncasecmp(s1, s2, len);