Message ID | 1410900696-6481-22-git-send-email-linux@rasmusvillemoes.dk (mailing list archive) |
---|---|
State | Accepted, archived |
Delegated to: | Zhang Rui |
Headers | show |
On Tue, 2014-09-16 at 22:51 +0200, 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: Zhang Rui <rui.zhang@intel.com> > Cc: Eduardo Valentin <edubezval@gmail.com> > Cc: linux-pm@vger.kernel.org > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Acked-by: Zhang Rui <rui.zhang@intel.com> thanks, rui > --- > drivers/thermal/thermal_core.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c > index 71b0ec0..1e23f4f 100644 > --- a/drivers/thermal/thermal_core.c > +++ b/drivers/thermal/thermal_core.c > @@ -66,7 +66,7 @@ static struct thermal_governor *__find_governor(const char *name) > return def_governor; > > list_for_each_entry(pos, &thermal_governor_list, governor_list) > - if (!strnicmp(name, pos->name, THERMAL_NAME_LENGTH)) > + if (!strncasecmp(name, pos->name, THERMAL_NAME_LENGTH)) > return pos; > > return NULL; > @@ -104,7 +104,7 @@ int thermal_register_governor(struct thermal_governor *governor) > > name = pos->tzp->governor_name; > > - if (!strnicmp(name, governor->name, THERMAL_NAME_LENGTH)) > + if (!strncasecmp(name, governor->name, THERMAL_NAME_LENGTH)) > pos->governor = governor; > } > > @@ -129,7 +129,7 @@ void thermal_unregister_governor(struct thermal_governor *governor) > mutex_lock(&thermal_list_lock); > > list_for_each_entry(pos, &thermal_tz_list, node) { > - if (!strnicmp(pos->governor->name, governor->name, > + if (!strncasecmp(pos->governor->name, governor->name, > THERMAL_NAME_LENGTH)) > pos->governor = NULL; > } > @@ -1665,7 +1665,7 @@ struct thermal_zone_device *thermal_zone_get_zone_by_name(const char *name) > > mutex_lock(&thermal_list_lock); > list_for_each_entry(pos, &thermal_tz_list, node) > - if (!strnicmp(name, pos->type, THERMAL_NAME_LENGTH)) { > + if (!strncasecmp(name, pos->type, THERMAL_NAME_LENGTH)) { > found++; > ref = pos; > } -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 71b0ec0..1e23f4f 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -66,7 +66,7 @@ static struct thermal_governor *__find_governor(const char *name) return def_governor; list_for_each_entry(pos, &thermal_governor_list, governor_list) - if (!strnicmp(name, pos->name, THERMAL_NAME_LENGTH)) + if (!strncasecmp(name, pos->name, THERMAL_NAME_LENGTH)) return pos; return NULL; @@ -104,7 +104,7 @@ int thermal_register_governor(struct thermal_governor *governor) name = pos->tzp->governor_name; - if (!strnicmp(name, governor->name, THERMAL_NAME_LENGTH)) + if (!strncasecmp(name, governor->name, THERMAL_NAME_LENGTH)) pos->governor = governor; } @@ -129,7 +129,7 @@ void thermal_unregister_governor(struct thermal_governor *governor) mutex_lock(&thermal_list_lock); list_for_each_entry(pos, &thermal_tz_list, node) { - if (!strnicmp(pos->governor->name, governor->name, + if (!strncasecmp(pos->governor->name, governor->name, THERMAL_NAME_LENGTH)) pos->governor = NULL; } @@ -1665,7 +1665,7 @@ struct thermal_zone_device *thermal_zone_get_zone_by_name(const char *name) mutex_lock(&thermal_list_lock); list_for_each_entry(pos, &thermal_tz_list, node) - if (!strnicmp(name, pos->type, THERMAL_NAME_LENGTH)) { + if (!strncasecmp(name, pos->type, THERMAL_NAME_LENGTH)) { found++; ref = pos; }
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: Zhang Rui <rui.zhang@intel.com> Cc: Eduardo Valentin <edubezval@gmail.com> Cc: linux-pm@vger.kernel.org Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- drivers/thermal/thermal_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)