Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp536179pxu; Fri, 4 Dec 2020 09:08:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJyjk4vvFtM4dxFZPfnEXD2kA9P1diZMA8cuxO1j4zXsXGdfSqHLHUMBD1HIbG/8Wip4WBfN X-Received: by 2002:a17:906:e18:: with SMTP id l24mr7732491eji.434.1607101735183; Fri, 04 Dec 2020 09:08:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607101735; cv=none; d=google.com; s=arc-20160816; b=orRkkm2gyOYDaEEQOg61RtiHX6t+FVRsDOxeVbd5Kdqn8zy6GIIDNohvsTe99zPgm/ AG6S26XY+xBp2kvQKAcT6azF3tGJD7OBgzRq7txikJ7kyWSkJyVfOC/E8nSfZ5ThAPFK kVSkuhS/FFGryegnsR/jMoQVpkAShbudLmZq/ned3NSQGRX258IcpByka8hWs1ZNop3T 3Bu6PI4eZs9GVWv58MNhHQACdf85jh9ZSdZ3LNhp8LHBf3e29Lx1+qy6mzxdhbKbzQw5 hu5RT6U+7ycn319BPEAVSQXXGslHC7XVi8LfxPgPVSeXk/isi0/LBrSMqwEYlh0m1z3C jbAA== 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=kvzBsH3Xpl7b8xgX8SGrBkieorIiMIG1baA8viuZhDQ=; b=pAtRgGVN8YYfFxhO0zijKD8acNRzXDpimBbolElJVsduby+36XDb7hpO4yRQJwZ3Lm 3ydty1toIhNEWtv0QYbK13oqNon1nYwPSXjsWW/lxOWxZHkwHWB+31bs1tLbPWegSYZz YT84FW9yPBA5eBgTVAt+436sQokUjOpnWP0bc0pJSZYlH97pbvbHdayz0lQfYzugSRk/ CpqjJscNyUc/Np2q8UedUN3b1/PqVShR7OdLmsm3wuRIjyc5kPJgawKXrV1fdleai1Ks e/JHBpKkZGr4jCYMhhmO7OuHTdHSYatudFTDfO8rcHvUQajbZlvayiiyYAG+mHPc9pYY fCrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@privacyrequired.com header.s=stigmate header.b="u9+/dCUD"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j1si3132825edf.417.2020.12.04.09.08.26; Fri, 04 Dec 2020 09:08:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@privacyrequired.com header.s=stigmate header.b="u9+/dCUD"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388436AbgLDRF0 (ORCPT + 99 others); Fri, 4 Dec 2020 12:05:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731071AbgLDRF0 (ORCPT ); Fri, 4 Dec 2020 12:05:26 -0500 Received: from latitanza.investici.org (latitanza.investici.org [IPv6:2001:888:2000:56::19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA380C061A4F for ; Fri, 4 Dec 2020 09:04:24 -0800 (PST) Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 4CnfFM5VFHz8shq; Fri, 4 Dec 2020 17:04:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=privacyrequired.com; s=stigmate; t=1607101463; bh=kvzBsH3Xpl7b8xgX8SGrBkieorIiMIG1baA8viuZhDQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u9+/dCUDR9K4HnTdV8GeKq5Oth3qwoJtratv/XxCi7TwxkITR+Hzp3v4rLmrEnlYP vnH/kufSF82RrOvkxSB7ULnvUWyWaaYM/E9y0Zwvt3MTr0uFxw8kmOmWB1QHrWnoe7 fM60XKJCReep7YUY2ukvbMZ+8YX5zIWmFqTLBJaE= Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: laniel_francis@privacyrequired.com) by localhost (Postfix) with ESMTPSA id 4CnfFM0n5Sz8sfb; Fri, 4 Dec 2020 17:04:22 +0000 (UTC) From: laniel_francis@privacyrequired.com To: Alasdair Kergon , Mike Snitzer , dm-devel@redhat.com Cc: Francis Laniel , linux-kernel@vger.kernel.org Subject: [RFC PATCH v1 04/12] device-mapper: Replace strstarts() by str_has_prefix(). Date: Fri, 4 Dec 2020 18:03:10 +0100 Message-Id: <20201204170319.20383-5-laniel_francis@privacyrequired.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201204170319.20383-1-laniel_francis@privacyrequired.com> References: <20201204170319.20383-1-laniel_francis@privacyrequired.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Francis Laniel The two functions indicates if a string begins with a given prefix. The only difference is that strstarts() returns a bool while str_has_prefix() returns the length of the prefix if the string begins with it or 0 otherwise. Signed-off-by: Francis Laniel --- drivers/md/dm-crypt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 392337f16ecf..b6f31b662d93 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -2659,7 +2659,7 @@ static int crypt_ctr_auth_cipher(struct crypt_config *cc, char *cipher_api) char *start, *end, *mac_alg = NULL; struct crypto_ahash *mac; - if (!strstarts(cipher_api, "authenc(")) + if (!str_has_prefix(cipher_api, "authenc(")) return 0; start = strchr(cipher_api, '('); @@ -2858,7 +2858,7 @@ static int crypt_ctr_cipher(struct dm_target *ti, char *cipher_in, char *key) return -ENOMEM; } - if (strstarts(cipher_in, "capi:")) + if (str_has_prefix(cipher_in, "capi:")) ret = crypt_ctr_cipher_new(ti, cipher_in, key, &ivmode, &ivopts); else ret = crypt_ctr_cipher_old(ti, cipher_in, key, &ivmode, &ivopts); -- 2.20.1