From patchwork Thu Mar 23 12:37:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 74052 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2886362wrt; Thu, 23 Mar 2023 05:42:02 -0700 (PDT) X-Google-Smtp-Source: AK7set/V1j6bs8hlICcxkwVLmJPzNOEeDGg6Dk189eGoSzewAv1ad/NsppAhaNoGa0D2EoL0+v2A X-Received: by 2002:a05:6402:b34:b0:4fa:7679:d44a with SMTP id bo20-20020a0564020b3400b004fa7679d44amr9104877edb.11.1679575322245; Thu, 23 Mar 2023 05:42:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679575322; cv=none; d=google.com; s=arc-20160816; b=eeszjhCc26zFZ/fIfwYDfnYci/TAFk1woXyjJGOlf2O0f+28hg4AtHvUmjFnKjpZMn kpKgNK5DaIjg00xrm+E3RywLgDkCwYHLb2Am5gEFSo8RHY8K1iJL89er1XSIp+s7KID1 wmxJ1kXEH9UbKmt4sO4a3l8lxphZmQOEr3uhNG4gz46gkgkWzwoO/D/FZ/1D9XzRGFiB TgoQVmXV7feg5fRJDlC+dNWxd1VvHpqZFT5LJc7Jxy64A4BTor+0sJIhpacWMM8Yp87D iDCD0XH/HUQOTNdQ4hoXPBwuK7ap/iD++hBNXKIoHvLXU6V/PnDvEZKU059DBP/Pj8YC 3IRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=721Z7SDczS3OH3C/rA5M8KAJUQ4zq1fQLbBIK7DPEPI=; b=KfPAiD3A622NvexMIrWC1DH4vaH4OIzWuuvyrML23xz+2lnrpNnT6WhCiAqJVZrjDJ Wv97ss7U+VPD0w48yp844MRM4C0xFmainsSlJkeiETJ4/s26XnbPawJqL8Es8P0xQ+7Z W3lV/YtZGLUhNj9EZ14KFtOtcu9Z4v3lhGl8+Wb+UT0DGuoK4FZh77/GSg+r5PNOZ1E9 XJsUBxL9XRjVbQyRinNBprnk0SgIDlBjvP0xWFa6HDCnEnHQSIaf48GWsUK8oOhe5QnG mAQEp9z7HhasKYWz+TSwdqoG3oJIJZ47SrdY3fRwF+UfSR3YAIE88mte3MvgJzvBcGnK eZtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=c4rvo83j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u15-20020aa7d88f000000b004fc995b3385si17772144edq.634.2023.03.23.05.41.38; Thu, 23 Mar 2023 05:42:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=c4rvo83j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231849AbjCWMgm (ORCPT + 99 others); Thu, 23 Mar 2023 08:36:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231599AbjCWMgi (ORCPT ); Thu, 23 Mar 2023 08:36:38 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 277DC26C15; Thu, 23 Mar 2023 05:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679574984; x=1711110984; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=r+ztcOnn0m/uP+HZ0+0cEy+nf6BiVCkiWkOotsDK89M=; b=c4rvo83jhJ2nLQrSFnjHUHfdytcNbPKzN+60XOeC4QdOZ//LKMBE109/ K9YWWal5oWizE74v6jjf9us71lofeENL13gOMmUsRibdAbAHwfo6C8OpK 2UY3VUi3qMkj5hk1b2dYPUfSuIxEC7y6JYK+MT/nbT1N7enGNlRe9rhVn 8S2p2LT76zSzbS70IbJWVBJSl5cduKwuTIoxpzuomdqnOaoOUzN9ATPz0 kANW5cnyt4A2SaP1im7c70+Cz3aHdnVbSh0EOzdaIv33wwbOOOz8inqnS R3savMneYomRoxUCWnTn+H2b0B3fO6ixz6c8GrhnN3zaJW6vL6clR3qd1 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="341011527" X-IronPort-AV: E=Sophos;i="5.98,283,1673942400"; d="scan'208";a="341011527" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2023 05:36:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="856466573" X-IronPort-AV: E=Sophos;i="5.98,283,1673942400"; d="scan'208";a="856466573" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 23 Mar 2023 05:36:20 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 35871250; Thu, 23 Mar 2023 14:37:07 +0200 (EET) From: Andy Shevchenko To: Kees Cook , Greg Kroah-Hartman , Andy Shevchenko , Cezary Rojewski , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Theodore Ts'o" , Jan Kara , Andy Shevchenko , "Rafael J. Wysocki" Subject: [PATCH v2 2/3] lib/string_helpers: Change returned value of the strreplace() Date: Thu, 23 Mar 2023 14:37:03 +0200 Message-Id: <20230323123704.37983-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230323123704.37983-1-andriy.shevchenko@linux.intel.com> References: <20230323123704.37983-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761162373435680941?= X-GMAIL-MSGID: =?utf-8?q?1761162373435680941?= It's more useful to return the pointer to the string itself with strreplace(), so it may be used like attr->name = strreplace(name, '/', '_'); While at it, amend the kernel documentation. Signed-off-by: Andy Shevchenko --- include/linux/string.h | 2 +- lib/string_helpers.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/linux/string.h b/include/linux/string.h index a7bff7ed3cb0..cb0c24ce0826 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -169,7 +169,7 @@ static inline void memcpy_flushcache(void *dst, const void *src, size_t cnt) #endif void *memchr_inv(const void *s, int c, size_t n); -char *strreplace(char *s, char old, char new); +char *strreplace(char *str, char old, char new); extern void kfree_const(const void *x); diff --git a/lib/string_helpers.c b/lib/string_helpers.c index 230020a2e076..d3b1dd718daf 100644 --- a/lib/string_helpers.c +++ b/lib/string_helpers.c @@ -979,18 +979,22 @@ EXPORT_SYMBOL(__sysfs_match_string); /** * strreplace - Replace all occurrences of character in string. - * @s: The string to operate on. + * @str: The string to operate on. * @old: The character being replaced. * @new: The character @old is replaced with. * - * Returns pointer to the nul byte at the end of @s. + * Replaces the each @old character with a @new one in the given string @str. + * + * Return: pointer to the string @str itself. */ -char *strreplace(char *s, char old, char new) +char *strreplace(char *str, char old, char new) { + char *s = str; + for (; *s; ++s) if (*s == old) *s = new; - return s; + return str; } EXPORT_SYMBOL(strreplace);