batman-adv: 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: Marek Lindner <mareklindner@neomailbox.ch>
Acked-by: Antonio Quartulli <antonio@meshcoding.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c
index 6f5e621f220ae0d6c419cff55aa87094c12f59d0..88a1bc3804d148972761276b347e258873a1b59e 100644 (file)
--- a/net/batman-adv/gateway_common.c
+++ b/net/batman-adv/gateway_common.c
@@ -44,10 +44,10 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff,
        if (strlen(buff) > 4) {
                tmp_ptr = buff + strlen(buff) - 4;
 
-               if (strnicmp(tmp_ptr, "mbit", 4) == 0)
+               if (strncasecmp(tmp_ptr, "mbit", 4) == 0)
                        bw_unit_type = BATADV_BW_UNIT_MBIT;
 
-               if ((strnicmp(tmp_ptr, "kbit", 4) == 0) ||
+               if ((strncasecmp(tmp_ptr, "kbit", 4) == 0) ||
                    (bw_unit_type == BATADV_BW_UNIT_MBIT))
                        *tmp_ptr = '\0';
        }
@@ -77,10 +77,10 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff,
                if (strlen(slash_ptr + 1) > 4) {
                        tmp_ptr = slash_ptr + 1 - 4 + strlen(slash_ptr + 1);
 
-                       if (strnicmp(tmp_ptr, "mbit", 4) == 0)
+                       if (strncasecmp(tmp_ptr, "mbit", 4) == 0)
                                bw_unit_type = BATADV_BW_UNIT_MBIT;
 
-                       if ((strnicmp(tmp_ptr, "kbit", 4) == 0) ||
+                       if ((strncasecmp(tmp_ptr, "kbit", 4) == 0) ||
                            (bw_unit_type == BATADV_BW_UNIT_MBIT))
                                *tmp_ptr = '\0';
                }