From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755717AbaIPU4a (ORCPT ); Tue, 16 Sep 2014 16:56:30 -0400 Received: from mail-lb0-f175.google.com ([209.85.217.175]:53003 "EHLO mail-lb0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754958AbaIPUwN (ORCPT ); Tue, 16 Sep 2014 16:52:13 -0400 From: Rasmus Villemoes To: Andrew Morton Cc: linux-kernel@vger.kernel.org, Rasmus Villemoes , Adaptec OEM Raid Solutions , "James E.J. Bottomley" , linux-scsi@vger.kernel.org Subject: [PATCH 13/22] scsi: Replace strnicmp with strncasecmp Date: Tue, 16 Sep 2014 22:51:27 +0200 Message-Id: <1410900696-6481-14-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1410900696-6481-1-git-send-email-linux@rasmusvillemoes.dk> References: <1410900696-6481-1-git-send-email-linux@rasmusvillemoes.dk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: Adaptec OEM Raid Solutions Cc: "James E.J. Bottomley" Cc: linux-scsi@vger.kernel.org Signed-off-by: Rasmus Villemoes --- drivers/scsi/ips.c | 2 +- drivers/scsi/scsi_debug.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 52a216f..e5afc38 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c @@ -528,7 +528,7 @@ ips_setup(char *ips_str) * Update the variables */ for (i = 0; i < ARRAY_SIZE(options); i++) { - if (strnicmp + if (strncasecmp (key, options[i].option_name, strlen(options[i].option_name)) == 0) { if (value) diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index d19c0e3..c81af36 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -3367,7 +3367,7 @@ static ssize_t opts_store(struct device_driver *ddp, const char *buf, char work[20]; if (1 == sscanf(buf, "%10s", work)) { - if (0 == strnicmp(work,"0x", 2)) { + if (0 == strncasecmp(work,"0x", 2)) { if (1 == sscanf(&work[2], "%x", &opts)) goto opts_done; } else { -- 2.0.4