Commit 30614cf3 authored Oct 13, 2014 by Rasmus Villemoes Committed by Linus Torvalds Oct 14, 2014

altera-stapl: replace strnicmp with strncasecmp



The kernel used to contain two functions for length-delimited,
case-insensitive string comparison, strnicmp with correct semantics and
a slightly buggy strncasecmp.  The latter is the POSIX name, so strnicmp
was renamed to strncasecmp, and strnicmp made into a wrapper for the new
strncasecmp to avoid breaking existing users.

To allow the compat wrapper strnicmp to be removed at some point in the
future, and to avoid the extra indirection cost, do
s/strnicmp/strncasecmp/g.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: "Igor M. Liplianin" <liplianin@netup.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 0f3ae5ba

drivers/misc/altera-stapl/altera.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -454,7 +454,7 @@ static int altera_execute(struct altera_state *astate,

		name = &p[str_table + name_id];

		if (strnicmp(aconf->action, name, strlen(name)) == 0) {
		if (strncasecmp(aconf->action, name, strlen(name)) == 0) {
		action_found = 1;
		current_proc =
		get_unaligned_be32(&p[action_table +
		@@ -2176,7 +2176,7 @@ static int altera_get_note(u8 *p, s32 program_size,
		key_ptr = &p[note_strings +
		get_unaligned_be32(
		&p[note_table + (8 * i)])];
		if ((strnicmp(key, key_ptr, strlen(key_ptr)) == 0) &&
		if ((strncasecmp(key, key_ptr, strlen(key_ptr)) == 0) &&
		(key != NULL)) {
		status = 0;