From patchwork Fri Jun 8 10:20:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 10454081 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E9A6A6053F for ; Fri, 8 Jun 2018 10:21:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6F2529514 for ; Fri, 8 Jun 2018 10:21:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DB9942951C; Fri, 8 Jun 2018 10:21:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 85DA62951E for ; Fri, 8 Jun 2018 10:21:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A152C308330B; Fri, 8 Jun 2018 10:21:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 72A161001F45; Fri, 8 Jun 2018 10:21:30 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0FC5A180121C; Fri, 8 Jun 2018 10:21:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w58ALJc3017669 for ; Fri, 8 Jun 2018 06:21:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 63B31A113A; Fri, 8 Jun 2018 10:21:19 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx11.extmail.prod.ext.phx2.redhat.com [10.5.110.40]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9983BA112C; Fri, 8 Jun 2018 10:21:17 +0000 (UTC) Received: from smtp2.provo.novell.com (smtp2.provo.novell.com [137.65.250.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9D8033084030; Fri, 8 Jun 2018 10:21:16 +0000 (UTC) Received: from apollon.suse.de.de (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by smtp2.provo.novell.com with ESMTP (TLS encrypted); Fri, 08 Jun 2018 04:21:07 -0600 From: Martin Wilck To: Christophe Varoqui Date: Fri, 8 Jun 2018 12:20:18 +0200 Message-Id: <20180608102041.22904-6-mwilck@suse.com> In-Reply-To: <20180608102041.22904-1-mwilck@suse.com> References: <20180608102041.22904-1-mwilck@suse.com> X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 08 Jun 2018 10:21:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 08 Jun 2018 10:21:16 +0000 (UTC) for IP:'137.65.250.81' DOMAIN:'smtp2.provo.novell.com' HELO:'smtp2.provo.novell.com' FROM:'mwilck@suse.com' RCPT:'' X-RedHat-Spam-Score: -2.301 (RCVD_IN_DNSWL_MED, SPF_PASS) 137.65.250.81 smtp2.provo.novell.com 137.65.250.81 smtp2.provo.novell.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.40 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-loop: dm-devel@redhat.com Cc: dm-devel@redhat.com, Xose Vazquez Perez , Martin Wilck Subject: [dm-devel] [PATCH 05/28] libmultipath: some const usage in hwentry handling X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Fri, 08 Jun 2018 10:21:31 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP Add some const qualifiers in in the code dealing with hwentries. Signed-off-by: Martin Wilck --- libmultipath/blacklist.c | 6 ++++-- libmultipath/config.c | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c index ee396e26..34a7e717 100644 --- a/libmultipath/blacklist.c +++ b/libmultipath/blacklist.c @@ -126,7 +126,8 @@ _blacklist (vector blist, const char * str) } int -_blacklist_exceptions_device(vector elist, char * vendor, char * product) +_blacklist_exceptions_device(const struct _vector *elist, const char * vendor, + const char * product) { int i; struct blentry_device * ble; @@ -144,7 +145,8 @@ _blacklist_exceptions_device(vector elist, char * vendor, char * product) } int -_blacklist_device (vector blist, char * vendor, char * product) +_blacklist_device (const struct _vector *blist, const char * vendor, + const char * product) { int i; struct blentry_device * ble; diff --git a/libmultipath/config.c b/libmultipath/config.c index ce7bedac..44f141ba 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c @@ -28,7 +28,7 @@ #include "propsel.h" static int -hwe_strmatch (struct hwentry *hwe1, struct hwentry *hwe2) +hwe_strmatch (const struct hwentry *hwe1, const struct hwentry *hwe2) { if ((hwe2->vendor && !hwe1->vendor) || (hwe1->vendor && (!hwe2->vendor || @@ -49,7 +49,7 @@ hwe_strmatch (struct hwentry *hwe1, struct hwentry *hwe2) } static struct hwentry * -find_hwe_strmatch (vector hwtable, struct hwentry *hwe) +find_hwe_strmatch (const struct _vector *hwtable, const struct hwentry *hwe) { int i; struct hwentry *tmp, *ret = NULL; @@ -64,7 +64,7 @@ find_hwe_strmatch (vector hwtable, struct hwentry *hwe) } static int -hwe_regmatch (struct hwentry *hwe1, struct hwentry *hwe2) +hwe_regmatch (const struct hwentry *hwe1, const struct hwentry *hwe2) { regex_t vre, pre, rre; int retval = 1; @@ -283,7 +283,7 @@ alloc_hwe (void) } static char * -set_param_str(char * str) +set_param_str(const char * str) { char * dst; int len;