Skip to content
Snippets Groups Projects
Commit 58294050 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Jens Axboe
Browse files

block: 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.

Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 2341c2f8
No related branches found
No related tags found
No related merge requests found
...@@ -81,7 +81,7 @@ int mac_partition(struct parsed_partitions *state) ...@@ -81,7 +81,7 @@ int mac_partition(struct parsed_partitions *state)
be32_to_cpu(part->start_block) * (secsize/512), be32_to_cpu(part->start_block) * (secsize/512),
be32_to_cpu(part->block_count) * (secsize/512)); be32_to_cpu(part->block_count) * (secsize/512));
if (!strnicmp(part->type, "Linux_RAID", 10)) if (!strncasecmp(part->type, "Linux_RAID", 10))
state->parts[slot].flags = ADDPART_FLAG_RAID; state->parts[slot].flags = ADDPART_FLAG_RAID;
#ifdef CONFIG_PPC_PMAC #ifdef CONFIG_PPC_PMAC
/* /*
...@@ -100,7 +100,7 @@ int mac_partition(struct parsed_partitions *state) ...@@ -100,7 +100,7 @@ int mac_partition(struct parsed_partitions *state)
goodness++; goodness++;
if (strcasecmp(part->type, "Apple_UNIX_SVR2") == 0 if (strcasecmp(part->type, "Apple_UNIX_SVR2") == 0
|| (strnicmp(part->type, "Linux", 5) == 0 || (strncasecmp(part->type, "Linux", 5) == 0
&& strcasecmp(part->type, "Linux_swap") != 0)) { && strcasecmp(part->type, "Linux_swap") != 0)) {
int i, l; int i, l;
...@@ -109,13 +109,13 @@ int mac_partition(struct parsed_partitions *state) ...@@ -109,13 +109,13 @@ int mac_partition(struct parsed_partitions *state)
if (strcmp(part->name, "/") == 0) if (strcmp(part->name, "/") == 0)
goodness++; goodness++;
for (i = 0; i <= l - 4; ++i) { for (i = 0; i <= l - 4; ++i) {
if (strnicmp(part->name + i, "root", if (strncasecmp(part->name + i, "root",
4) == 0) { 4) == 0) {
goodness += 2; goodness += 2;
break; break;
} }
} }
if (strnicmp(part->name, "swap", 4) == 0) if (strncasecmp(part->name, "swap", 4) == 0)
goodness--; goodness--;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment