scsi: 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: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Rasmus Villemoes 2014-10-13 15:54:44 -07:00 committed by Linus Torvalds
parent b7a8d756fb
commit 48a968763d
2 changed files with 2 additions and 2 deletions

View File

@ -528,7 +528,7 @@ ips_setup(char *ips_str)
* Update the variables * Update the variables
*/ */
for (i = 0; i < ARRAY_SIZE(options); i++) { for (i = 0; i < ARRAY_SIZE(options); i++) {
if (strnicmp if (strncasecmp
(key, options[i].option_name, (key, options[i].option_name,
strlen(options[i].option_name)) == 0) { strlen(options[i].option_name)) == 0) {
if (value) if (value)

View File

@ -3371,7 +3371,7 @@ static ssize_t opts_store(struct device_driver *ddp, const char *buf,
char work[20]; char work[20];
if (1 == sscanf(buf, "%10s", work)) { if (1 == sscanf(buf, "%10s", work)) {
if (0 == strnicmp(work,"0x", 2)) { if (0 == strncasecmp(work,"0x", 2)) {
if (1 == sscanf(&work[2], "%x", &opts)) if (1 == sscanf(&work[2], "%x", &opts))
goto opts_done; goto opts_done;
} else { } else {