| Message ID | 1410900696-6481-11-git-send-email-linux@rasmusvillemoes.dk (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Tuesday, September 16, 2014 10:51:24 PM Rasmus Villemoes wrote: > 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: "Rafael J. Wysocki" <rjw@rjwysocki.net> > Cc: Len Brown <lenb@kernel.org> > Cc: linux-acpi@vger.kernel.org > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Queued up for 3.18, thanks! > --- > drivers/acpi/battery.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c > index 5fdfe65..8ec8a89 100644 > --- a/drivers/acpi/battery.c > +++ b/drivers/acpi/battery.c > @@ -695,7 +695,7 @@ static void acpi_battery_quirks(struct acpi_battery *battery) > if (battery->power_unit && dmi_name_in_vendors("LENOVO")) { > const char *s; > s = dmi_get_system_info(DMI_PRODUCT_VERSION); > - if (s && !strnicmp(s, "ThinkPad", 8)) { > + if (s && !strncasecmp(s, "ThinkPad", 8)) { > dmi_walk(find_battery, battery); > if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, > &battery->flags) && >
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 5fdfe65..8ec8a89 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -695,7 +695,7 @@ static void acpi_battery_quirks(struct acpi_battery *battery) if (battery->power_unit && dmi_name_in_vendors("LENOVO")) { const char *s; s = dmi_get_system_info(DMI_PRODUCT_VERSION); - if (s && !strnicmp(s, "ThinkPad", 8)) { + if (s && !strncasecmp(s, "ThinkPad", 8)) { dmi_walk(find_battery, battery); if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags) &&
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: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Len Brown <lenb@kernel.org> Cc: linux-acpi@vger.kernel.org Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- drivers/acpi/battery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)