korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

block: Replace strnicmp with strncasecmp

Browse Source 
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: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Rasmus Villemoes 2014-09-16 22:51:16 +02:00 committed by Jens Axboe
parent 2341c2f8c3
commit 582940508b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block/partitions/mac.c
View File

@ -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)
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)
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--;
} }